up: add some new commands for gitlab

inhere · Mar 25, 2022 · 789be67 · 789be67
1 parent 7db35e8
commit 789be67
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 7 deletions.
diff --git a/app/Console/Attach/Gitlab/BranchCmd.php b/app/Console/Attach/Gitlab/BranchCmd.php
@@ -25,6 +25,7 @@ public static function aliases(): array
     protected function subCommands(): array
     {
         return [
+            BranchInitCmd::class,
             BranchCreateCmd::class,
         ];
     }

diff --git a/app/Console/Attach/Gitlab/BranchCreateCmd.php b/app/Console/Attach/Gitlab/BranchCreateCmd.php
@@ -17,6 +17,11 @@ class BranchCreateCmd extends Command
     protected static string $name = 'create';
     protected static string $desc = 'create a new branch for gitlab project';
 
+    public static function aliases(): array
+    {
+        return ['new', 'n'];
+    }
+
     protected function configFlags(FlagsParser $fs): void
     {
         // $this->flags->addOptByRule($name, $rule);

diff --git a/app/Console/Attach/Gitlab/BranchInitCmd.php b/app/Console/Attach/Gitlab/BranchInitCmd.php
@@ -0,0 +1,38 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Kite\Console\Attach\Gitlab;
+
+use Inhere\Console\Command;
+use Inhere\Console\IO\Input;
+use Inhere\Console\IO\Output;
+use Toolkit\PFlag\FlagsParser;
+
+/**
+ * Class BranchInitCmd
+ *
+ * @package Inhere\Kite\Console\Controller\Gitlab
+ */
+class BranchInitCmd extends Command
+{
+    protected static string $name = 'init';
+    protected static string $desc = 'quick init testing, qa, pre branches for gitlab project';
+
+    protected function configFlags(FlagsParser $fs): void
+    {
+        // $this->flags->addOptByRule($name, $rule);
+    }
+
+    /**
+     * Do execute command
+     *
+     * @param Input  $input
+     * @param Output $output
+     *
+     * @return int|mixed
+     */
+    protected function execute(Input $input, Output $output): mixed
+    {
+        $output->println(__METHOD__);
+        return 0;
+    }
+}
diff --git a/app/Console/Command/SearchCommand.php b/app/Console/Command/SearchCommand.php
@@ -5,6 +5,10 @@
 use Inhere\Console\Command;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
+use Inhere\Kite\Helper\AppHelper;
+use InvalidArgumentException;
+use Toolkit\Stdlib\Str\UrlHelper;
+use function implode;
 use function strpos;
 use function substr;
 
@@ -36,14 +40,33 @@ class SearchCommand extends Command
         'scholar'       => 'https://scholar.google.com/scholar?q=',
     ];
 
+    /**
+     * @var array{string, string}
+     */
+    private array $engAliases = [
+        'bi'  => 'bing',
+        'b'   => 'baidu',
+        'bd'  => 'baidu',
+        'g'   => 'google',
+        'gg'  => 'google',
+        'gh'  => 'github',
+        'ddg' => 'duckduckgo',
+        'sf'  => 'stackoverflow',
+    ];
+
+    public static function aliases(): array
+    {
+        return ['s'];
+    }
+
     /**
      * Search by web search engine, such as google, baidu, bing
      *
      * @arguments
-     * keywords     The keywords for search
+     * keywords     array;The keywords for search;true
      *
      * @options
-     *  -e, --engine    string;The web search engine name;;google
+     *  -e, --engine    string;The web search engine name;;baidu
      *  -l, --list      bool;list all web search engine
      *
      * @param Input $input
@@ -54,12 +77,24 @@ class SearchCommand extends Command
     protected function execute(Input $input, Output $output): int
     {
         if ($this->flags->getOpt('list')) {
+            $output->aList($this->engAliases, 'Engine Aliases');
             $output->aList($this->getEngineList(), 'Engine List');
             return 0;
         }
 
+        $engine = $this->flags->getOpt('engine');
+        $engine = $this->engAliases[$engine] ?? $engine;
+        if (!isset($this->engines[$engine])) {
+            throw new InvalidArgumentException('invalid engine name: ' . $engine);
+        }
+
+        $engUrl   = $this->engines[$engine];
+        $keywords = $this->flags->getArg('keywords');
+        $queryStr = UrlHelper::encode(implode(' ', $keywords));
+
         // on MAC: open URL
         // on MAC: open_command URL
+        AppHelper::openBrowser($engUrl . $queryStr);
         return 0;
     }
 
@@ -68,11 +103,11 @@ private function getEngineList(): array
         $list = [];
         foreach ($this->engines as $name => $url) {
             if ($pos = strpos($url, '.com/')) {
-                $url = substr($url, 0, $pos+4);
+                $url = substr($url, 0, $pos + 4);
             } elseif ($pos = strpos($url, '.org/')) {
-                $url = substr($url, 0, $pos+4);
+                $url = substr($url, 0, $pos + 4);
             } elseif ($pos = strpos($url, '.ru/')) {
-                $url = substr($url, 0, $pos+4);
+                $url = substr($url, 0, $pos + 4);
             }
 
             $list[$name] = $url;

diff --git a/app/Console/Controller/GitLabController.php b/app/Console/Controller/GitLabController.php
@@ -23,7 +23,6 @@
 use Inhere\Kite\Helper\AppHelper;
 use Inhere\Kite\Helper\GitUtil;
 use Throwable;
-use Toolkit\FsUtil\Path;
 use Toolkit\PFlag\FlagsParser;
 use Toolkit\Stdlib\Str;
 use function array_merge;
@@ -78,6 +77,7 @@ protected static function commandAliases(): array
             'updatePush'   => ['upp', 'up-push'],
             'project'      => ['pj', 'info'],
             'checkout'     => ['co'],
+            'branch'       => BranchCmd::aliases(),
         ];
     }
 

diff --git a/app/Console/Controller/StringController.php b/app/Console/Controller/StringController.php
@@ -329,7 +329,7 @@ public function processCommand(FlagsParser $fs, Output $output): void
         $cutChar = $cut;
         if (strlen($cut) > 1) {
             if ($cut[0] === 'L') {
-                $cutPos = 'L';
+                // $cutPos = 'L';
                 $cutChar= substr($cut, 1);
             } elseif ($cut[0] === 'R') {
                 $cutPos = 'R';