Commit a20bd456 by Antonio Ramirez

Fixed formatting

parent d40e2446
...@@ -20,345 +20,391 @@ namespace yii\helpers\base; ...@@ -20,345 +20,391 @@ namespace yii\helpers\base;
*/ */
class Console class Console
{ {
const FG_BLACK = 30; const FG_BLACK = 30;
const FG_RED = 31; const FG_RED = 31;
const FG_GREEN = 32; const FG_GREEN = 32;
const FG_YELLOW = 33; const FG_YELLOW = 33;
const FG_BLUE = 34; const FG_BLUE = 34;
const FG_PURPLE = 35; const FG_PURPLE = 35;
const FG_CYAN = 36; const FG_CYAN = 36;
const FG_GREY = 37; const FG_GREY = 37;
const BG_BLACK = 40; const BG_BLACK = 40;
const BG_RED = 41; const BG_RED = 41;
const BG_GREEN = 42; const BG_GREEN = 42;
const BG_YELLOW = 43; const BG_YELLOW = 43;
const BG_BLUE = 44; const BG_BLUE = 44;
const BG_PURPLE = 45; const BG_PURPLE = 45;
const BG_CYAN = 46; const BG_CYAN = 46;
const BG_GREY = 47; const BG_GREY = 47;
const NORMAL = 0; const NORMAL = 0;
const BOLD = 1; const BOLD = 1;
const ITALIC = 3; const ITALIC = 3;
const UNDERLINE = 4; const UNDERLINE = 4;
const BLINK = 5; const BLINK = 5;
const NEGATIVE = 7; const NEGATIVE = 7;
const CONCEALED = 8; const CONCEALED = 8;
const CROSSED_OUT = 9; const CROSSED_OUT = 9;
const FRAMED = 51; const FRAMED = 51;
const ENCIRCLED = 52; const ENCIRCLED = 52;
const OVERLINED = 53; const OVERLINED = 53;
/** /**
* Moves the terminal cursor up by sending ANSI control code CUU to the terminal. * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
* If the cursor is already at the edge of the screen, this has no effect. * If the cursor is already at the edge of the screen, this has no effect.
* @param integer $rows number of rows the cursor should be moved up * @param integer $rows number of rows the cursor should be moved up
*/ */
public static function moveCursorUp($rows=1) public static function moveCursorUp($rows = 1)
{ {
echo "\033[" . (int) $rows . 'A'; echo "\033[" . (int)$rows . 'A';
} }
/** /**
* Moves the terminal cursor down by sending ANSI control code CUD to the terminal. * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
* If the cursor is already at the edge of the screen, this has no effect. * If the cursor is already at the edge of the screen, this has no effect.
* @param integer $rows number of rows the cursor should be moved down * @param integer $rows number of rows the cursor should be moved down
*/ */
public static function moveCursorDown($rows=1) public static function moveCursorDown($rows = 1)
{ {
echo "\033[" . (int) $rows . 'B'; echo "\033[" . (int)$rows . 'B';
} }
/** /**
* Moves the terminal cursor forward by sending ANSI control code CUF to the terminal. * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
* If the cursor is already at the edge of the screen, this has no effect. * If the cursor is already at the edge of the screen, this has no effect.
* @param integer $steps number of steps the cursor should be moved forward * @param integer $steps number of steps the cursor should be moved forward
*/ */
public static function moveCursorForward($steps=1) public static function moveCursorForward($steps = 1)
{ {
echo "\033[" . (int) $steps . 'C'; echo "\033[" . (int)$steps . 'C';
} }
/** /**
* Moves the terminal cursor backward by sending ANSI control code CUB to the terminal. * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
* If the cursor is already at the edge of the screen, this has no effect. * If the cursor is already at the edge of the screen, this has no effect.
* @param integer $steps number of steps the cursor should be moved backward * @param integer $steps number of steps the cursor should be moved backward
*/ */
public static function moveCursorBackward($steps=1) public static function moveCursorBackward($steps = 1)
{ {
echo "\033[" . (int) $steps . 'D'; echo "\033[" . (int)$steps . 'D';
} }
/** /**
* Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal. * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
* @param integer $lines number of lines the cursor should be moved down * @param integer $lines number of lines the cursor should be moved down
*/ */
public static function moveCursorNextLine($lines=1) public static function moveCursorNextLine($lines = 1)
{ {
echo "\033[" . (int) $lines . 'E'; echo "\033[" . (int)$lines . 'E';
} }
/** /**
* Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal. * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
* @param integer $lines number of lines the cursor should be moved up * @param integer $lines number of lines the cursor should be moved up
*/ */
public static function moveCursorPrevLine($lines=1) public static function moveCursorPrevLine($lines = 1)
{ {
echo "\033[" . (int) $lines . 'F'; echo "\033[" . (int)$lines . 'F';
} }
/** /**
* Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal. * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
* @param integer $column 1-based column number, 1 is the left edge of the screen. * @param integer $column 1-based column number, 1 is the left edge of the screen.
* @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line. * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
*/ */
public static function moveCursorTo($column, $row=null) public static function moveCursorTo($column, $row = null)
{ {
if ($row === null) { if ($row === null) {
echo "\033[" . (int) $column . 'G'; echo "\033[" . (int)$column . 'G';
} else { } else {
echo "\033[" . (int) $row . ';' . (int) $column . 'H'; echo "\033[" . (int)$row . ';' . (int)$column . 'H';
} }
} }
/** /**
* Scrolls whole page up by sending ANSI control code SU to the terminal. * Scrolls whole page up by sending ANSI control code SU to the terminal.
* New lines are added at the bottom. This is not supported by ANSI.SYS used in windows. * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
* @param int $lines number of lines to scroll up * @param int $lines number of lines to scroll up
*/ */
public static function scrollUp($lines=1) public static function scrollUp($lines = 1)
{ {
echo "\033[".(int)$lines."S"; echo "\033[" . (int)$lines . "S";
} }
/** /**
* Scrolls whole page down by sending ANSI control code SD to the terminal. * Scrolls whole page down by sending ANSI control code SD to the terminal.
* New lines are added at the top. This is not supported by ANSI.SYS used in windows. * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
* @param int $lines number of lines to scroll down * @param int $lines number of lines to scroll down
*/ */
public static function scrollDown($lines=1) public static function scrollDown($lines = 1)
{ {
echo "\033[".(int)$lines."T"; echo "\033[" . (int)$lines . "T";
} }
/** /**
* Saves the current cursor position by sending ANSI control code SCP to the terminal. * Saves the current cursor position by sending ANSI control code SCP to the terminal.
* Position can then be restored with {@link restoreCursorPosition}. * Position can then be restored with {@link restoreCursorPosition}.
*/ */
public static function saveCursorPosition() public static function saveCursorPosition()
{ {
echo "\033[s"; echo "\033[s";
} }
/** /**
* Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal. * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
*/ */
public static function restoreCursorPosition() public static function restoreCursorPosition()
{ {
echo "\033[u"; echo "\033[u";
} }
/** /**
* Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal. * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
* Use {@link showCursor} to bring it back. * Use {@link showCursor} to bring it back.
* Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit. * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
*/ */
public static function hideCursor() public static function hideCursor()
{ {
echo "\033[?25l"; echo "\033[?25l";
} }
/** /**
* Will show a cursor again when it has been hidden by {@link hideCursor} by sending ANSI DECTCEM code ?25h to the terminal. * Will show a cursor again when it has been hidden by {@link hideCursor} by sending ANSI DECTCEM code ?25h to the terminal.
*/ */
public static function showCursor() public static function showCursor()
{ {
echo "\033[?25h"; echo "\033[?25h";
} }
/** /**
* Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal. * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
* Cursor position will not be changed. * Cursor position will not be changed.
* **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen. * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
*/ */
public static function clearScreen() public static function clearScreen()
{ {
echo "\033[2J"; echo "\033[2J";
} }
/** /**
* Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal. * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
* Cursor position will not be changed. * Cursor position will not be changed.
*/ */
public static function clearScreenBeforeCursor() public static function clearScreenBeforeCursor()
{ {
echo "\033[1J"; echo "\033[1J";
} }
/** /**
* Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal. * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
* Cursor position will not be changed. * Cursor position will not be changed.
*/ */
public static function clearScreenAfterCursor() public static function clearScreenAfterCursor()
{ {
echo "\033[0J"; echo "\033[0J";
} }
/** /**
* Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal. * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
* Cursor position will not be changed. * Cursor position will not be changed.
*/ */
public static function clearLine() public static function clearLine()
{ {
echo "\033[2K"; echo "\033[2K";
} }
/** /**
* Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal. * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
* Cursor position will not be changed. * Cursor position will not be changed.
*/ */
public static function clearLineBeforeCursor() public static function clearLineBeforeCursor()
{ {
echo "\033[1K"; echo "\033[1K";
} }
/** /**
* Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal. * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
* Cursor position will not be changed. * Cursor position will not be changed.
*/ */
public static function clearLineAfterCursor() public static function clearLineAfterCursor()
{ {
echo "\033[0K"; echo "\033[0K";
} }
/** /**
* Will send ANSI format for following output * Will send ANSI format for following output
* *
* You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
* TODO: documentation * TODO: documentation
*/ */
public static function ansiStyle() public static function ansiStyle()
{ {
echo "\033[" . implode(';', func_get_args()) . 'm'; echo "\033[" . implode(';', func_get_args()) . 'm';
} }
/** /**
* Will return a string formatted with the given ANSI style * Will return a string formatted with the given ANSI style
* *
* See {@link ansiStyle} for possible arguments. * See {@link ansiStyle} for possible arguments.
* @param string $string the string to be formatted * @param string $string the string to be formatted
* @return string * @return string
*/ */
public static function ansiStyleString($string) public static function ansiStyleString($string)
{ {
$args = func_get_args(); $args = func_get_args();
array_shift($args); array_shift($args);
$code = implode(';', $args); $code = implode(';', $args);
return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string."\033[0m"; return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
} }
//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors //const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
public static function xterm256ColorFg($i) // TODO naming! public static function xterm256ColorFg($i) // TODO naming!
{ {
return '38;5;'.$i; return '38;5;' . $i;
} }
public static function xterm256ColorBg($i) // TODO naming! public static function xterm256ColorBg($i) // TODO naming!
{ {
return '48;5;'.$i; return '48;5;' . $i;
} }
/** /**
* Usage: list($w, $h) = ConsoleHelper::getScreenSize(); * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
* *
* @return array * @return array
*/ */
public static function getScreenSize() public static function getScreenSize()
{ {
// TODO implement // TODO implement
return array(150,50); return array(150, 50);
} }
/** /**
* resets any ansi style set by previous method {@link ansiStyle} * resets any ansi style set by previous method {@link ansiStyle}
* Any output after this is will have default text style. * Any output after this is will have default text style.
*/ */
public static function reset() public static function reset()
{ {
echo "\033[0m"; echo "\033[0m";
} }
/** /**
* Strips ANSI control codes from a string * Strips ANSI control codes from a string
* *
* @param string $string String to strip * @param string $string String to strip
* @return string * @return string
*/ */
public static function strip($string) public static function strip($string)
{ {
return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
} }
// TODO refactor and review // TODO refactor and review
public static function ansiToHtml($string) public static function ansiToHtml($string)
{ {
$tags = 0; $tags = 0;
return preg_replace_callback('/\033\[[\d;]+m/', function($ansi) use (&$tags) { return preg_replace_callback(
$styleA = array(); '/\033\[[\d;]+m/',
foreach(explode(';', $ansi) as $controlCode) function ($ansi) use (&$tags) {
{ $styleA = array();
switch($controlCode) foreach (explode(';', $ansi) as $controlCode) {
{ switch ($controlCode) {
case static::FG_BLACK: $style = array('color' => '#000000'); break; case static::FG_BLACK:
case static::FG_BLUE: $style = array('color' => '#000078'); break; $style = array('color' => '#000000');
case static::FG_CYAN: $style = array('color' => '#007878'); break; break;
case static::FG_GREEN: $style = array('color' => '#007800'); break; case static::FG_BLUE:
case static::FG_GREY: $style = array('color' => '#787878'); break; $style = array('color' => '#000078');
case static::FG_PURPLE: $style = array('color' => '#780078'); break; break;
case static::FG_RED: $style = array('color' => '#780000'); break; case static::FG_CYAN:
case static::FG_YELLOW: $style = array('color' => '#787800'); break; $style = array('color' => '#007878');
case static::BG_BLACK: $style = array('background-color' => '#000000'); break; break;
case static::BG_BLUE: $style = array('background-color' => '#000078'); break; case static::FG_GREEN:
case static::BG_CYAN: $style = array('background-color' => '#007878'); break; $style = array('color' => '#007800');
case static::BG_GREEN: $style = array('background-color' => '#007800'); break; break;
case static::BG_GREY: $style = array('background-color' => '#787878'); break; case static::FG_GREY:
case static::BG_PURPLE: $style = array('background-color' => '#780078'); break; $style = array('color' => '#787878');
case static::BG_RED: $style = array('background-color' => '#780000'); break; break;
case static::BG_YELLOW: $style = array('background-color' => '#787800'); break; case static::FG_PURPLE:
case static::BOLD: $style = array('font-weight' => 'bold'); break; $style = array('color' => '#780078');
case static::ITALIC: $style = array('font-style' => 'italic'); break; break;
case static::UNDERLINE: $style = array('text-decoration' => array('underline')); break; case static::FG_RED:
case static::OVERLINED: $style = array('text-decoration' => array('overline')); break; $style = array('color' => '#780000');
case static::CROSSED_OUT:$style = array('text-decoration' => array('line-through')); break; break;
case static::BLINK: $style = array('text-decoration' => array('blink')); break; case static::FG_YELLOW:
case static::NEGATIVE: // ??? $style = array('color' => '#787800');
case static::CONCEALED: break;
case static::ENCIRCLED: case static::BG_BLACK:
case static::FRAMED: $style = array('background-color' => '#000000');
// TODO allow resetting codes break;
break; case static::BG_BLUE:
case 0: // ansi reset $style = array('background-color' => '#000078');
$return = ''; break;
for($n=$tags; $tags>0; $tags--) { case static::BG_CYAN:
$return .= '</span>'; $style = array('background-color' => '#007878');
} break;
return $return; case static::BG_GREEN:
} $style = array('background-color' => '#007800');
break;
$styleA = ArrayHelper::merge($styleA, $style); case static::BG_GREY:
} $style = array('background-color' => '#787878');
$styleString[] = array(); break;
foreach($styleA as $name => $content) { case static::BG_PURPLE:
if ($name === 'text-decoration') { $style = array('background-color' => '#780078');
$content = implode(' ', $content); break;
} case static::BG_RED:
$styleString[] = $name.':'.$content; $style = array('background-color' => '#780000');
} break;
$tags++; case static::BG_YELLOW:
return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>'; $style = array('background-color' => '#787800');
}, $string); break;
} case static::BOLD:
$style = array('font-weight' => 'bold');
break;
case static::ITALIC:
$style = array('font-style' => 'italic');
break;
case static::UNDERLINE:
$style = array('text-decoration' => array('underline'));
break;
case static::OVERLINED:
$style = array('text-decoration' => array('overline'));
break;
case static::CROSSED_OUT:
$style = array('text-decoration' => array('line-through'));
break;
case static::BLINK:
$style = array('text-decoration' => array('blink'));
break;
case static::NEGATIVE: // ???
case static::CONCEALED:
case static::ENCIRCLED:
case static::FRAMED:
// TODO allow resetting codes
break;
case 0: // ansi reset
$return = '';
for ($n = $tags; $tags > 0; $tags--) {
$return .= '</span>';
}
return $return;
}
$styleA = ArrayHelper::merge($styleA, $style);
}
$styleString[] = array();
foreach ($styleA as $name => $content) {
if ($name === 'text-decoration') {
$content = implode(' ', $content);
}
$styleString[] = $name . ':' . $content;
}
$tags++;
return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
},
$string
);
}
/** /**
* *
...@@ -413,97 +459,100 @@ class Console ...@@ -413,97 +459,100 @@ class Console
} }
/** /**
* TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
* *
* Converts colorcodes in the format %y (for yellow) into ansi-control * Converts colorcodes in the format %y (for yellow) into ansi-control
* codes. The conversion table is: ('bold' meaning 'light' on some * codes. The conversion table is: ('bold' meaning 'light' on some
* terminals). It's almost the same conversion table irssi uses. * terminals). It's almost the same conversion table irssi uses.
* <pre> * <pre>
* text text background * text text background
* ------------------------------------------------ * ------------------------------------------------
* %k %K %0 black dark grey black * %k %K %0 black dark grey black
* %r %R %1 red bold red red * %r %R %1 red bold red red
* %g %G %2 green bold green green * %g %G %2 green bold green green
* %y %Y %3 yellow bold yellow yellow * %y %Y %3 yellow bold yellow yellow
* %b %B %4 blue bold blue blue * %b %B %4 blue bold blue blue
* %m %M %5 magenta bold magenta magenta * %m %M %5 magenta bold magenta magenta
* %p %P magenta (think: purple) * %p %P magenta (think: purple)
* %c %C %6 cyan bold cyan cyan * %c %C %6 cyan bold cyan cyan
* %w %W %7 white bold white white * %w %W %7 white bold white white
* *
* %F Blinking, Flashing * %F Blinking, Flashing
* %U Underline * %U Underline
* %8 Reverse * %8 Reverse
* %_,%9 Bold * %_,%9 Bold
* *
* %n Resets the color * %n Resets the color
* %% A single % * %% A single %
* </pre> * </pre>
* First param is the string to convert, second is an optional flag if * First param is the string to convert, second is an optional flag if
* colors should be used. It defaults to true, if set to false, the * colors should be used. It defaults to true, if set to false, the
* colorcodes will just be removed (And %% will be transformed into %) * colorcodes will just be removed (And %% will be transformed into %)
* *
* @param string $string String to convert * @param string $string String to convert
* @param bool $colored Should the string be colored? * @param bool $colored Should the string be colored?
* *
* @return string * @return string
*/ */
public static function renderColoredString($string, $colored = true) public static function renderColoredString($string, $colored = true)
{ {
static $conversions = array ( // static so the array doesn't get built static $conversions = array( // static so the array doesn't get built
// everytime // everytime
// %y - yellow, and so on... {{{ // %y - yellow, and so on... {{{
'%y' => array('color' => 'yellow'), '%y' => array('color' => 'yellow'),
'%g' => array('color' => 'green' ), '%g' => array('color' => 'green'),
'%b' => array('color' => 'blue' ), '%b' => array('color' => 'blue'),
'%r' => array('color' => 'red' ), '%r' => array('color' => 'red'),
'%p' => array('color' => 'purple'), '%p' => array('color' => 'purple'),
'%m' => array('color' => 'purple'), '%m' => array('color' => 'purple'),
'%c' => array('color' => 'cyan' ), '%c' => array('color' => 'cyan'),
'%w' => array('color' => 'grey' ), '%w' => array('color' => 'grey'),
'%k' => array('color' => 'black' ), '%k' => array('color' => 'black'),
'%n' => array('color' => 'reset' ), '%n' => array('color' => 'reset'),
'%Y' => array('color' => 'yellow', 'style' => 'light'), '%Y' => array('color' => 'yellow', 'style' => 'light'),
'%G' => array('color' => 'green', 'style' => 'light'), '%G' => array('color' => 'green', 'style' => 'light'),
'%B' => array('color' => 'blue', 'style' => 'light'), '%B' => array('color' => 'blue', 'style' => 'light'),
'%R' => array('color' => 'red', 'style' => 'light'), '%R' => array('color' => 'red', 'style' => 'light'),
'%P' => array('color' => 'purple', 'style' => 'light'), '%P' => array('color' => 'purple', 'style' => 'light'),
'%M' => array('color' => 'purple', 'style' => 'light'), '%M' => array('color' => 'purple', 'style' => 'light'),
'%C' => array('color' => 'cyan', 'style' => 'light'), '%C' => array('color' => 'cyan', 'style' => 'light'),
'%W' => array('color' => 'grey', 'style' => 'light'), '%W' => array('color' => 'grey', 'style' => 'light'),
'%K' => array('color' => 'black', 'style' => 'light'), '%K' => array('color' => 'black', 'style' => 'light'),
'%N' => array('color' => 'reset', 'style' => 'light'), '%N' => array('color' => 'reset', 'style' => 'light'),
'%3' => array('background' => 'yellow'), '%3' => array('background' => 'yellow'),
'%2' => array('background' => 'green' ), '%2' => array('background' => 'green'),
'%4' => array('background' => 'blue' ), '%4' => array('background' => 'blue'),
'%1' => array('background' => 'red' ), '%1' => array('background' => 'red'),
'%5' => array('background' => 'purple'), '%5' => array('background' => 'purple'),
'%6' => array('background' => 'cyan' ), '%6' => array('background' => 'cyan'),
'%7' => array('background' => 'grey' ), '%7' => array('background' => 'grey'),
'%0' => array('background' => 'black' ), '%0' => array('background' => 'black'),
// Don't use this, I can't stand flashing text // Don't use this, I can't stand flashing text
'%F' => array('style' => 'blink'), '%F' => array('style' => 'blink'),
'%U' => array('style' => 'underline'), '%U' => array('style' => 'underline'),
'%8' => array('style' => 'inverse'), '%8' => array('style' => 'inverse'),
'%9' => array('style' => 'bold'), '%9' => array('style' => 'bold'),
'%_' => array('style' => 'bold') '%_' => array('style' => 'bold')
// }}} // }}}
); );
if ($colored) { if ($colored) {
$string = str_replace('%%', '% ', $string); $string = str_replace('%%', '% ', $string);
foreach ($conversions as $key => $value) { foreach ($conversions as $key => $value) {
$string = str_replace($key, static::color($value), $string = str_replace(
$string); $key,
} static::color($value),
$string = str_replace('% ', '%', $string); $string
);
} else { }
$string = preg_replace('/%((%)|.)/', '$2', $string); $string = str_replace('% ', '%', $string);
}
} else {
return $string; $string = preg_replace('/%((%)|.)/', '$2', $string);
} }
return $string;
}
/** /**
* Returns the different foreground and background color codes and styles available. * Returns the different foreground and background color codes and styles available.
...@@ -512,7 +561,7 @@ class Console ...@@ -512,7 +561,7 @@ class Console
public static function getColorCodes() public static function getColorCodes()
{ {
return array( return array(
'color' => array( 'color' => array(
'black' => static::FG_BLACK, 'black' => static::FG_BLACK,
'red' => static::FG_RED, 'red' => static::FG_RED,
'green' => static::FG_GREEN, 'green' => static::FG_GREEN,
...@@ -522,7 +571,7 @@ class Console ...@@ -522,7 +571,7 @@ class Console
'cyan' => static::FG_CYAN, 'cyan' => static::FG_CYAN,
'grey' => static::FG_GREY, 'grey' => static::FG_GREY,
), ),
'style' => array( 'style' => array(
'normal' => static::NORMAL, 'normal' => static::NORMAL,
'bold' => static::BOLD, 'bold' => static::BOLD,
'italic' => static::ITALIC, 'italic' => static::ITALIC,
...@@ -548,18 +597,18 @@ class Console ...@@ -548,18 +597,18 @@ class Console
); );
} }
/** /**
* Escapes % so they don't get interpreted as color codes * Escapes % so they don't get interpreted as color codes
* *
* @param string $string String to escape * @param string $string String to escape
* *
* @access public * @access public
* @return string * @return string
*/ */
public static function escape($string) public static function escape($string)
{ {
return str_replace('%', '%%', $string); return str_replace('%', '%%', $string);
} }
/** /**
* Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream. * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
...@@ -570,7 +619,7 @@ class Console ...@@ -570,7 +619,7 @@ class Console
* @param mixed $stream * @param mixed $stream
* @return bool true if the stream supports ANSI colors, otherwise false. * @return bool true if the stream supports ANSI colors, otherwise false.
*/ */
public static function streamSupportsAnsiColors( $stream ) public static function streamSupportsAnsiColors($stream)
{ {
return DIRECTORY_SEPARATOR == '\\' return DIRECTORY_SEPARATOR == '\\'
? null !== getenv('ANSICON') ? null !== getenv('ANSICON')
...@@ -658,7 +707,7 @@ class Console ...@@ -658,7 +707,7 @@ class Console
*/ */
public static function input($prompt = null) public static function input($prompt = null)
{ {
if(isset($prompt)) { if (isset($prompt)) {
static::stdout($prompt); static::stdout($prompt);
} }
return static::stdin(); return static::stdin();
...@@ -692,14 +741,17 @@ class Console ...@@ -692,14 +741,17 @@ class Console
*/ */
public static function prompt($text, $options = array()) public static function prompt($text, $options = array())
{ {
$options = ArrayHelper::merge($options, array( $options = ArrayHelper::merge(
'required' => false, $options,
'default' => null, array(
'pattern' => null, 'required' => false,
'validator' => null, 'default' => null,
'error' => 'Invalid input.', 'pattern' => null,
)); 'validator' => null,
$error = null; 'error' => 'Invalid input.',
)
);
$error = null;
top: top:
$input = $options['default'] $input = $options['default']
...@@ -717,7 +769,8 @@ class Console ...@@ -717,7 +769,8 @@ class Console
static::output($options['error']); static::output($options['error']);
goto top; goto top;
} elseif ($options['validator'] && } elseif ($options['validator'] &&
!call_user_func_array($options['validator'], array($input, &$error))) { !call_user_func_array($options['validator'], array($input, &$error))
) {
static::output(isset($error) ? $error : $options['error']); static::output(isset($error) ? $error : $options['error']);
goto top; goto top;
} }
...@@ -736,7 +789,7 @@ class Console ...@@ -736,7 +789,7 @@ class Console
{ {
top: top:
$input = strtolower(static::input("$prompt [y/n]: ")); $input = strtolower(static::input("$prompt [y/n]: "));
if (!in_array(substr($input,0,1), array('y', 'n'))) { if (!in_array(substr($input, 0, 1), array('y', 'n'))) {
static::output("Please, type 'y' or 'n'"); static::output("Please, type 'y' or 'n'");
goto top; goto top;
} }
...@@ -763,7 +816,9 @@ class Console ...@@ -763,7 +816,9 @@ class Console
} }
echo " ? - Show help\n"; echo " ? - Show help\n";
goto top; goto top;
} elseif (!in_array($input, array_keys($options))) goto top; } elseif (!in_array($input, array_keys($options))) {
goto top;
}
return $input; return $input;
} }
...@@ -775,51 +830,51 @@ class Console ...@@ -775,51 +830,51 @@ class Console
* @param int $size the size of the status bar (optional) * @param int $size the size of the status bar (optional)
* @see http://snipplr.com/view/29548/ * @see http://snipplr.com/view/29548/
*/ */
public static function showProgress($done, $total, $size=30) public static function showProgress($done, $total, $size = 30)
{ {
static $start; static $start;
// if we go over our bound, just ignore it // if we go over our bound, just ignore it
if($done > $total) { if ($done > $total) {
return; return;
} }
if(empty($start)) { if (empty($start)) {
$start=time(); $start = time();
} }
$now = time(); $now = time();
$percent=(double)($done/$total); $percent = (double)($done / $total);
$bar=floor($percent*$size); $bar = floor($percent * $size);
$status="\r["; $status = "\r[";
$status.=str_repeat("=", $bar); $status .= str_repeat("=", $bar);
if($bar<$size){ if ($bar < $size) {
$status.=">"; $status .= ">";
$status.=str_repeat(" ", $size-$bar); $status .= str_repeat(" ", $size - $bar);
} else { } else {
$status.="="; $status .= "=";
} }
$display=number_format($percent*100, 0); $display = number_format($percent * 100, 0);
$status.="] $display% $done/$total"; $status .= "] $display% $done/$total";
$rate = ($now-$start)/$done; $rate = ($now - $start) / $done;
$left = $total - $done; $left = $total - $done;
$eta = round($rate * $left, 2); $eta = round($rate * $left, 2);
$elapsed = $now - $start; $elapsed = $now - $start;
$status.= " remaining: ".number_format($eta)." sec. elapsed: ".number_format($elapsed)." sec."; $status .= " remaining: " . number_format($eta) . " sec. elapsed: " . number_format($elapsed) . " sec.";
static::stdout("$status "); static::stdout("$status ");
flush(); flush();
// when done, send a newline // when done, send a newline
if($done == $total) { if ($done == $total) {
echo "\n"; echo "\n";
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment