update: update the gh,gl command redirect to git group logic

inhere · May 18, 2022 · b3bc65c · b3bc65c
1 parent b89a8a4
commit b3bc65c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/app/Console/Component/RedirectToGitGroup.php b/app/Console/Component/RedirectToGitGroup.php
@@ -23,13 +23,13 @@ class RedirectToGitGroup extends AbstractObj
 
     /**
      * @param Controller $ctrl
-     * @param string $action
+     * @param string $command
      * @param array $args
      *
      * @return bool
      * @throws Throwable
      */
-    public function handle(Controller $ctrl, string $action, array $args): bool
+    public function handle(Controller $ctrl, string $command, array $args): bool
     {
         if (!$this->cmdList) {
             return false;
@@ -39,8 +39,7 @@ public function handle(Controller $ctrl, string $action, array $args): bool
 
         // resolve alias
         $gitCtrl = $app->getController(GitController::getName());
-
-        $action = $gitCtrl->resolveAlias($action);
+        $action = $gitCtrl->resolveAlias($command);
         $group  = $ctrl->getRealGName();
 
         // if $first = *, will redirect all command.
@@ -49,8 +48,8 @@ public function handle(Controller $ctrl, string $action, array $args): bool
             // auto proxy env
             Kite::autoProxy()->applyProxyEnv($action, $group);
 
-            Cli::info("NOTICE: will redirect to git group for run subcommand: $action");
-            $ctrl->debugf('command %s not found on %s, will redirect to the git group', $action, $group);
+            Cli::info("[NOTE] will redirect to git group and run subcommand: $action");
+            $ctrl->debugf('group: %s - command "%s" not found, will redirect to the git group', $group, $command);
 
             $newArgs = [];
             if ($ctrl->getFlags()->getOpt('dry-run')) {

diff --git a/app/Console/Controller/Gitx/GitController.php b/app/Console/Controller/Gitx/GitController.php
@@ -137,16 +137,16 @@ protected function beforeRun(): void
     }
 
     /**
-     * @param string $action
+     * @param string $command
      * @param array $args
      *
      * @return bool
      */
-    protected function onNotFound(string $action, array $args): bool
+    protected function onNotFound(string $command, array $args): bool
     {
-        $this->output->info("input command '$action' is not found, will exec git command: `git $action`");
+        $this->output->info("git: input command '$command' is not found, will exec git command: `git $command`");
 
-        $c = Cmd::git($action);
+        $c = Cmd::git($command);
         $c->withIf(fn() => $c->addArgs(...$args), $args);
 
         // if ($args) {

diff --git a/app/Console/Controller/Gitx/GitHubController.php b/app/Console/Controller/Gitx/GitHubController.php
@@ -88,13 +88,13 @@ protected function beforeRun(): void
     }
 
     /**
-     * @param string $action
+     * @param string $command
      * @param array  $args
      *
      * @return bool
      * @throws Throwable
      */
-    protected function onNotFound(string $action, array $args): bool
+    protected function onNotFound(string $command, array $args): bool
     {
         if (!$this->app) {
             return false;
@@ -104,7 +104,7 @@ protected function onNotFound(string $action, array $args): bool
             'cmdList' => $this->settings['redirectGit'] ?? [],
         ]);
 
-        return $h->handle($this, $action, $args);
+        return $h->handle($this, $command, $args);
     }
 
     /**

diff --git a/app/Console/Controller/Gitx/GitLabController.php b/app/Console/Controller/Gitx/GitLabController.php
@@ -138,13 +138,13 @@ protected function beforeRun(): void
     }
 
     /**
-     * @param string $action
+     * @param string $command
      * @param array $args
      *
      * @return bool
      * @throws Throwable
      */
-    protected function onNotFound(string $action, array $args): bool
+    protected function onNotFound(string $command, array $args): bool
     {
         if (!$this->app) {
             return false;
@@ -154,7 +154,7 @@ protected function onNotFound(string $action, array $args): bool
             'cmdList' => $this->settings['redirectGit'] ?? [],
         ]);
 
-        return $h->handle($this, $action, $args);
+        return $h->handle($this, $command, $args);
     }
 
     /**