sda-php/nulib-base
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifs.mineures sans commentaires

Browse Source
This commit is contained in:
Jephté Clain 2025-10-15 15:33:13 +04:00
parent 48d5f84bbd
commit a0c6fb21e6
3 changed files with 85 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
php/src/output/std/AbstractMessenger.php
View File

@ -84,9 +84,8 @@ abstract class AbstractMessenger implements _IMessenger {
}
protected function _printTitle(
?string $linePrefix, int $level,
string $type, $content,
int $indentLevel, StdOutput $out
int $level, string $type, ?string $linePrefix, int $indentLevel,
StdOutput $out, $content
): void {
$prefixes = self::GENERIC_PREFIXES[$level][$type];
if ($prefixes[0]) $out->print();
@ -136,10 +135,10 @@ abstract class AbstractMessenger implements _IMessenger {
protected abstract function action__flush(bool $endAction=false, ?int $overrideLevel=null): void;
protected function _printAction(
?string $linePrefix, int $level,
int $level, ?string $linePrefix, int $indentLevel,
StdOutput $out,
bool $printContent, $content,
bool $printResult, ?bool $rsuccess, $rcontent,
int $indentLevel, StdOutput $out
bool $printResult, ?bool $rsuccess, $rcontent
): void {
$color = $out->isColor();
if ($rsuccess === true) $type = "success";
@ -211,9 +210,8 @@ abstract class AbstractMessenger implements _IMessenger {
}
protected function _printGeneric(
?string $linePrefix, int $level,
string $type, $content,
int $indentLevel, StdOutput $out
int $level, string $type, ?string $linePrefix, int $indentLevel,
StdOutput $out, $content
): void {
$prefixes = self::GENERIC_PREFIXES[$level][$type];
$content = cl::with($content);
@ -246,9 +244,8 @@ abstract class AbstractMessenger implements _IMessenger {
}
protected function _printGenericOrException(
?int $level,
string $type, $content,
int $indentLevel, StdOutput $out
?int $level, string $type, int $indentLevel,
StdOutput $out, $content
): void {
$linePrefix = $this->getLinePrefix();
# si $content contient des exceptions, les afficher avec un level moindre
@ -274,7 +271,7 @@ abstract class AbstractMessenger implements _IMessenger {
$showContent = $this->checkLevel($level);
if ($content !== null && $showContent) {
$this->action__flush(); $flushActions = false;
$this->_printGeneric($linePrefix, $level, $type, $content, $indentLevel, $out);
$this->_printGeneric($level, $type, $linePrefix, $indentLevel, $out, $content);
}
if ($exceptions !== null) {
$level1 = $this->decrLevel($level);
@ -284,15 +281,15 @@ abstract class AbstractMessenger implements _IMessenger {
$message = exceptions::get_message($exception);
if ($showContent) {
if ($flushActions) { $this->action__flush(); $flushActions = false; }
$this->_printGeneric($linePrefix, $level, $type, $message, $indentLevel, $out);
$this->_printGeneric($level, $type, $linePrefix, $indentLevel, $out, $message);
}
# puis summary et traceback
if ($showTraceback) {
if ($flushActions) { $this->action__flush(); $flushActions = false; }
$summary = exceptions::get_summary($exception, false);
$this->_printGeneric($linePrefix, $level1, $type, $summary, $indentLevel, $out);
$this->_printGeneric($level1, $type, $linePrefix, $indentLevel, $out, $summary);
$traceback = exceptions::get_traceback($exception);
$this->_printGeneric($linePrefix, $level1, $type, $traceback, $indentLevel, $out);
$this->_printGeneric($level1, $type, $linePrefix, $indentLevel, $out, $traceback);
}
}
}

81
php/src/output/std/ConsoleMessenger.php
View File

@ -124,8 +124,8 @@ class ConsoleMessenger extends AbstractMessenger {
$this->inSection = true;
if (!$this->checkLevel($level)) return;
$this->section = [
"msg_level" => $level,
"line_prefix" => $this->getLinePrefix(),
"level" => $level,
"content" => $content,
"print_content" => true,
];
@ -142,9 +142,8 @@ class ConsoleMessenger extends AbstractMessenger {
$section =& $this->section;
if ($section !== null && $section["print_content"]) {
$this->_printTitle(
$section["line_prefix"], $section["level"],
"section", $section["content"],
0, $this->err);
$section["msg_level"], "section", $section["line_prefix"], 0,
$this->err, $section["content"]);
$section["print_content"] = false;
}
}
@ -154,7 +153,7 @@ class ConsoleMessenger extends AbstractMessenger {
if ($indentLevel < 0) $indentLevel = 0;
if ($withActions) {
foreach ($this->actions as $action) {
if ($action["level"] < $this->minLevel) continue;
if ($action["msg_level"] < $this->minLevel) continue;
$indentLevel++;
}
}
@ -189,17 +188,15 @@ class ConsoleMessenger extends AbstractMessenger {
foreach ($this->titles as &$title) {
if ($title["print_content"]) {
$this->_printTitle(
$title["line_prefix"], $title["level"],
"title", $title["content"],
$indentLevel, $err);
$title["msg_level"], "title", $title["line_prefix"], $indentLevel,
$err, $title["content"]);
$title["print_content"] = false;
}
if ($title["print_descs"]) {
foreach ($title["descs"] as $desc) {
$this->_printGeneric(
$desc["line_prefix"], $desc["level"],
"desc", $desc["content"],
$indentLevel, $err);
$desc["msg_level"], "desc", $desc["line_prefix"], $indentLevel,
$err, $desc["content"]);
}
$title["descs"] = [];
$title["print_descs"] = false;
@ -227,8 +224,8 @@ class ConsoleMessenger extends AbstractMessenger {
A::merge($this->titles[array_key_last($this->titles)], [
"title_level" => $marks[0],
"max_title_level" => null,
"msg_level" => $level,
"line_prefix" => $this->getLinePrefix(),
"level" => $level,
"content" => $content,
"print_content" => true,
"descs" => [],
@ -247,8 +244,8 @@ class ConsoleMessenger extends AbstractMessenger {
function desc($content, ?int $level=null): void {
if (!$this->checkLevel($level)) return;
$desc = [
"msg_level" => $level,
"line_prefix" => $this->getLinePrefix(),
"level" => $level,
"content" => $content,
];
$key = array_key_last($this->titles);
@ -259,9 +256,8 @@ class ConsoleMessenger extends AbstractMessenger {
} else {
# pas de titre en cours
$this->_printGeneric(
$desc["line_prefix"], $desc["level"],
"desc", $desc["content"],
0, $this->err);
$desc["msg_level"], "desc", $desc["line_prefix"], 0,
$this->err, $desc["content"]);
}
}
@ -294,8 +290,8 @@ class ConsoleMessenger extends AbstractMessenger {
$index = 0;
foreach ($this->actions as &$action) {
$mergeResult = $index++ == $lastIndex && $endAction;
$level = $overrideLevel?? $action["msg_level"];
$linePrefix = $action["line_prefix"];
$level = $overrideLevel?? $action["level"];
$content = $action["content"];
$printContent = $action["print_content"];
$rsuccess = $action["result_success"];
@ -304,33 +300,32 @@ class ConsoleMessenger extends AbstractMessenger {
if ($mergeResult) {
if (time() - $action["timestamp"] <= 2) {
$this->_printAction(
$linePrefix, $level,
$level, $linePrefix, $indentLevel,
$err,
$printContent, $content,
true, $rsuccess, $rcontent,
$indentLevel, $err);
true, $rsuccess, $rcontent);
} else {
# si l'action a pris plus de 2 secondes, ne pas fusionner pour que
# l'on voit le temps que ça a pris
$this->_printAction(
$linePrefix, $level,
$level, $linePrefix, $indentLevel,
$err,
$printContent, $content,
false, null, null,
$indentLevel, $err);
false, null, null);
# recalculer une nouvelle ligne de préfixe pour le résultat
$linePrefix = $this->getLinePrefix();
$this->_printAction(
$linePrefix, $level,
$level, $linePrefix, $indentLevel,
$err,
false, null,
true, $rsuccess, $rcontent,
$indentLevel, $err);
true, $rsuccess, $rcontent);
}
} elseif ($printContent) {
$this->_printAction(
$linePrefix, $level,
$level, $linePrefix, $indentLevel,
$err,
$printContent, $content,
false, $rsuccess, $rcontent,
$indentLevel, $err);
false, $rsuccess, $rcontent);
$action["print_content"] = false;
}
$indentLevel++;
@ -358,8 +353,8 @@ class ConsoleMessenger extends AbstractMessenger {
"action_level" => $marks[0],
"max_action_level" => null,
"timestamp" => time(),
"msg_level" => $level,
"line_prefix" => $this->getLinePrefix(),
"level" => $level,
"content" => $content,
"print_content" => true,
"result_success" => null,
@ -383,8 +378,8 @@ class ConsoleMessenger extends AbstractMessenger {
function step($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "step", $content,
$this->getIndentLevel(), $this->err);
$level, "step", $this->getIndentLevel(),
$this->err, $content);
}
function asuccess($content=null, ?int $overrideLevel=null): void {
@ -421,32 +416,32 @@ class ConsoleMessenger extends AbstractMessenger {
function print($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "print", $content,
$this->getIndentLevel(), $this->out);
$level, "print", $this->getIndentLevel(),
$this->out, $content);
}
function info($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "info", $content,
$this->getIndentLevel(), $this->err);
$level, "info", $this->getIndentLevel(),
$this->err, $content);
}
function note($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "note", $content,
$this->getIndentLevel(), $this->err);
$level, "note", $this->getIndentLevel(),
$this->err, $content);
}
function warning($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "warning", $content,
$this->getIndentLevel(), $this->err);
$level, "warning", $this->getIndentLevel(),
$this->err, $content);
}
function error($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "error", $content,
$this->getIndentLevel(), $this->err);
$level, "error", $this->getIndentLevel(),
$this->err, $content);
}
function end(bool $all=false): void {

72
php/src/output/std/LogMessenger.php
View File

@ -91,9 +91,8 @@ class LogMessenger extends AbstractMessenger {
$this->section__end();
if (!$this->checkLevel($level)) return;
$this->_printTitle(
$this->getLinePrefix(), $level,
"section", $content,
0, $this->out);
$level, "section", $this->getLinePrefix(), 0,
$this->out, $content);
if ($func !== null) {
try {
$func($this);
@ -144,9 +143,8 @@ class LogMessenger extends AbstractMessenger {
"max_title_level" => null,
];
$this->_printTitle(
$this->getLinePrefix(), $level,
"title", $content,
$marks[0], $this->out);
$level, "title", $this->getLinePrefix(), $marks[0],
$this->out, $content);
if ($func !== null) {
try {
$this->title__beforeFunc($marks);
@ -161,10 +159,8 @@ class LogMessenger extends AbstractMessenger {
if (!$this->checkLevel($level)) return;
$titleLevel = end($this->titles)["title_level"] ?? 0;
$this->_printGeneric(
$this->getLinePrefix(), $level,
"desc", $content,
$titleLevel, $this->out);
$level, "desc", $this->getLinePrefix(), $titleLevel,
$this->out, $content);
}
protected array $actions;
@ -209,13 +205,13 @@ class LogMessenger extends AbstractMessenger {
"id" => $this->lastActionId++,
"action_level" => $marks[0],
"max_action_level" => null,
"level" => $level
"msg_level" => $level
];
$this->_printAction(
$this->getLinePrefix(), $level,
$level, $this->getLinePrefix(), $marks[0],
$this->out,
true, $content,
false, null, null,
$marks[0], $this->out);
false, null, null);
if ($func !== null) {
try {
$this->action__beforeFunc($marks);
@ -234,43 +230,43 @@ class LogMessenger extends AbstractMessenger {
function step($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "step", $content,
$this->getIndentLevel(), $this->out);
$level, "step", $this->getIndentLevel(),
$this->out, $content);
}
function asuccess($content=null, ?int $overrideLevel=null): void {
if ($this->action__getMarks()[0] == 0) $this->action(null);
$action = end($this->actions);
$level = $overrideLevel ?? $action["level"];
$level = $overrideLevel ?? $action["msg_level"];
$this->_printAction(
$this->getLinePrefix(), $level,
$level, $this->getLinePrefix(), $action["action_level"],
$this->out,
false, null,
true, true, $content,
$action["action_level"], $this->out);
true, true, $content);
$this->action__end();
}
function afailure($content=null, ?int $overrideLevel=null): void {
if ($this->action__getMarks()[0] == 0) $this->action(null);
$action = end($this->actions);
$level = $overrideLevel ?? $action["level"];
$level = $overrideLevel ?? $action["msg_level"];
$this->_printAction(
$this->getLinePrefix(), $level,
$level, $this->getLinePrefix(), $action["action_level"],
$this->out,
false, null,
true, false, $content,
$action["action_level"], $this->out);
true, false, $content);
$this->action__end();
}
function adone($content=null, ?int $overrideLevel=null): void {
if ($this->action__getMarks()[0] == 0) $this->action(null);
$action = end($this->actions);
$level = $overrideLevel ?? $action["level"];
$level = $overrideLevel ?? $action["msg_level"];
$this->_printAction(
$this->getLinePrefix(), $level,
$level, $this->getLinePrefix(), $action["action_level"],
$this->out,
false, null,
true, null, $content,
$action["action_level"], $this->out);
true, null, $content);
$this->action__end();
}
@ -291,32 +287,32 @@ class LogMessenger extends AbstractMessenger {
function print($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "print", $content,
$this->getIndentLevel(), $this->out);
$level, "print", $this->getIndentLevel(),
$this->out, $content);
}
function info($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "info", $content,
$this->getIndentLevel(), $this->out);
$level, "info", $this->getIndentLevel(),
$this->out, $content);
}
function note($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "note", $content,
$this->getIndentLevel(), $this->out);
$level, "note", $this->getIndentLevel(),
$this->out, $content);
}
function warning($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "warning", $content,
$this->getIndentLevel(), $this->out);
$level, "warning", $this->getIndentLevel(),
$this->out, $content);
}
function error($content, ?int $level=null): void {
$this->_printGenericOrException(
$level, "error", $content,
$this->getIndentLevel(), $this->out);
$level, "error", $this->getIndentLevel(),
$this->out, $content);
}
function end(bool $all=false): void {