Merge pull request #1171 from janhq/j/update-install-uninstall-engine

fix: update engine install/uninstall CLI commands
janhq · Sep 9, 2024 · e0ddb8d · e0ddb8d
2 parents d31c7a9 + c1fc132
commit e0ddb8d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/engine/controllers/command_line_parser.cc b/engine/controllers/command_line_parser.cc
@@ -16,7 +16,6 @@
 #include "config/yaml_config.h"
 #include "httplib.h"
 #include "services/engine_service.h"
-#include "utils/cortex_utils.h"
 #include "utils/file_manager_utils.h"
 #include "utils/logging_utils.h"
 
@@ -135,9 +134,19 @@ bool CommandLineParser::SetupCommand(int argc, char** argv) {
       command.Exec();
     });
 
+    auto install_cmd = engines_cmd->add_subcommand("install", "Install engine");
+    install_cmd->callback([] { CLI_LOG("Engine name can't be empty!"); });
     for (auto& engine : engine_service_.kSupportEngines) {
       std::string engine_name{engine};
-      EngineManagement(engines_cmd, engine_name, version);
+      EngineInstall(install_cmd, engine_name, version);
+    }
+
+    auto uninstall_cmd =
+        engines_cmd->add_subcommand("uninstall", "Uninstall engine");
+    uninstall_cmd->callback([] { CLI_LOG("Engine name can't be empty!"); });
+    for (auto& engine : engine_service_.kSupportEngines) {
+      std::string engine_name{engine};
+      EngineUninstall(uninstall_cmd, engine_name);
     }
 
     EngineGet(engines_cmd);
@@ -227,25 +236,22 @@ bool CommandLineParser::SetupCommand(int argc, char** argv) {
   return true;
 }
 
-void CommandLineParser::EngineManagement(CLI::App* parent,
-                                         const std::string& engine_name,
-                                         std::string& version) {
-  auto engine_cmd =
-      parent->add_subcommand(engine_name, "Manage " + engine_name + " engine");
+void CommandLineParser::EngineInstall(CLI::App* parent,
+                                      const std::string& engine_name,
+                                      std::string& version) {
+  auto install_engine_cmd = parent->add_subcommand(engine_name, "");
 
-  auto install_cmd = engine_cmd->add_subcommand(
-      "install", "Install " + engine_name + " engine");
-  install_cmd->add_option("-v, --version", version,
-                          "Engine version. Default will be latest");
-
-  install_cmd->callback([engine_name, &version] {
+  install_engine_cmd->callback([&] {
     commands::EngineInitCmd eic(engine_name, version);
     eic.Exec();
   });
+}
+
+void CommandLineParser::EngineUninstall(CLI::App* parent,
+                                        const std::string& engine_name) {
+  auto uninstall_engine_cmd = parent->add_subcommand(engine_name, "");
 
-  auto uninstall_desc{"Uninstall " + engine_name + " engine"};
-  auto uninstall_cmd = engine_cmd->add_subcommand("uninstall", uninstall_desc);
-  uninstall_cmd->callback([engine_name] {
+  uninstall_engine_cmd->callback([&] {
     commands::EngineUninstallCmd cmd(engine_name);
     cmd.Exec();
   });

diff --git a/engine/controllers/command_line_parser.h b/engine/controllers/command_line_parser.h
@@ -9,8 +9,10 @@ class CommandLineParser {
   bool SetupCommand(int argc, char** argv);
 
  private:
-  void EngineManagement(CLI::App* parent, const std::string& engine_name,
-                        std::string& version);
+  void EngineInstall(CLI::App* parent, const std::string& engine_name,
+                     std::string& version);
+
+  void EngineUninstall(CLI::App* parent, const std::string& engine_name);
 
   void EngineGet(CLI::App* parent);