From 5e01a695722e6b1275d45803f1c13e8941cce5ba Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Mon, 16 Jun 2025 17:56:44 +0400 Subject: [PATCH] =?UTF-8?q?option=20pour=20ne=20pas=20recr=C3=A9er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.php | 2 +- src/cli/AbstractStorageApp.php | 4 +++- src/cli/StorageMysqlApp.php | 10 ++++------ src/cli/StoragePgsqlApp.php | 4 ++++ src/cli/StorageSqliteApp.php | 3 +++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/app.php b/src/app.php index 97802b9..fa64b05 100644 --- a/src/app.php +++ b/src/app.php @@ -459,7 +459,7 @@ class app { function getRunfile(): RunFile { $name = $this->name; $runfile = $this->getWorkfile($name); - $logfile = $this->getLogfile("$name.out", false); + $logfile = $this->getLogfile("$name.log", false); return $this->runfile ??= new RunFile($name, $runfile, $logfile); } diff --git a/src/cli/AbstractStorageApp.php b/src/cli/AbstractStorageApp.php index 41cea65..9526d74 100644 --- a/src/cli/AbstractStorageApp.php +++ b/src/cli/AbstractStorageApp.php @@ -19,6 +19,8 @@ abstract class AbstractStorageApp extends Application { protected int $action = self::ACTION_QUERY; + protected bool $recreate = true; + protected ?array $args = null; protected static function isa_cond(string $arg, ?array &$ms=null): bool { @@ -63,7 +65,7 @@ abstract class AbstractStorageApp extends Application { switch ($this->action) { case self::ACTION_RESET: - $capacitor->reset(true); + $capacitor->reset($this->recreate); break; case self::ACTION_QUERY: if (!$args) { diff --git a/src/cli/StorageMysqlApp.php b/src/cli/StorageMysqlApp.php index 42fea8e..300493a 100644 --- a/src/cli/StorageMysqlApp.php +++ b/src/cli/StorageMysqlApp.php @@ -2,13 +2,7 @@ namespace nulib\cli; use nulib\A; -use nulib\app\cli\Application; -use nulib\db\Capacitor; -use nulib\db\CapacitorChannel; use nulib\db\mysql\MysqlStorage; -use nulib\ext\yaml; -use nulib\file\Stream; -use nulib\output\msg; use nur\config; class StorageMysqlApp extends AbstractStorageApp { @@ -28,6 +22,9 @@ class StorageMysqlApp extends AbstractStorageApp { ["-z", "--reset", "name" => "action", "value" => self::ACTION_RESET, "help" => "réinitialiser le canal", ], + ["-n", "--no-recreate", "name" => "recreate", "value" => false, + "help" => "ne pas recréer la table correspondant au canal" + ], ["--query", "name" => "action", "value" => self::ACTION_QUERY, "help" => "lister les lignes correspondant aux valeurs spécifiées. c'est l'action par défaut", ], @@ -35,6 +32,7 @@ class StorageMysqlApp extends AbstractStorageApp { "help" => "afficher la requête pour créer la table", ], ]; + function main() { $dbconn = A::shift($this->args); if ($dbconn === null) self::die("Vous devez spécifier la base de données"); diff --git a/src/cli/StoragePgsqlApp.php b/src/cli/StoragePgsqlApp.php index fc63c65..48def90 100644 --- a/src/cli/StoragePgsqlApp.php +++ b/src/cli/StoragePgsqlApp.php @@ -22,6 +22,9 @@ class StoragePgsqlApp extends AbstractStorageApp { ["-z", "--reset", "name" => "action", "value" => self::ACTION_RESET, "help" => "réinitialiser le canal", ], + ["-n", "--no-recreate", "name" => "recreate", "value" => false, + "help" => "ne pas recréer la table correspondant au canal" + ], ["--query", "name" => "action", "value" => self::ACTION_QUERY, "help" => "lister les lignes correspondant aux valeurs spécifiées. c'est l'action par défaut", ], @@ -29,6 +32,7 @@ class StoragePgsqlApp extends AbstractStorageApp { "help" => "afficher la requête pour créer la table", ], ]; + function main() { $dbconn = A::shift($this->args); if ($dbconn === null) self::die("Vous devez spécifier la base de données"); diff --git a/src/cli/StorageSqliteApp.php b/src/cli/StorageSqliteApp.php index cacdba0..1724a0d 100644 --- a/src/cli/StorageSqliteApp.php +++ b/src/cli/StorageSqliteApp.php @@ -21,6 +21,9 @@ class StorageSqliteApp extends AbstractStorageApp { ["-z", "--reset", "name" => "action", "value" => self::ACTION_RESET, "help" => "réinitialiser le canal", ], + ["-n", "--no-recreate", "name" => "recreate", "value" => false, + "help" => "ne pas recréer la table correspondant au canal" + ], ["--query", "name" => "action", "value" => self::ACTION_QUERY, "help" => "lister les lignes correspondant aux valeurs spécifiées. c'est l'action par défaut", ],