chore: cleanup

Author: sangjanai

engine/cli/command_line_parser.cc

@@ -51,9 +51,7 @@ CommandLineParser::CommandLineParser()
       download_service_{std::make_shared<DownloadService>()},
       dylib_path_manager_{std::make_shared<cortex::DylibPathManager>()},
       db_service_{std::make_shared<DatabaseService>()},
-      engine_service_{std::make_shared<EngineService>(
-          download_service_, dylib_path_manager_, db_service_,
-          std::make_shared<cortex::TaskQueue>(1, "q"))} {}
+      engine_service_{std::make_shared<EngineService>(dylib_path_manager_)} {}
 
 bool CommandLineParser::SetupCommand(int argc, char** argv) {
   app_.usage("Usage:\n" + commands::GetCortexBinary() +

engine/cli/commands/server_start_cmd.cc

@@ -106,11 +106,7 @@ bool ServerStartCmd::Exec(const std::string& host, int port,
 #else
   std::vector<std::string> commands;
   // Some engines requires to add lib search path before process being created
-  auto download_srv = std::make_shared<DownloadService>();
-  auto dylib_path_mng = std::make_shared<cortex::DylibPathManager>();
-  auto db_srv = std::make_shared<DatabaseService>();
-  EngineService(download_srv, dylib_path_mng, db_srv,
-                std::make_shared<cortex::TaskQueue>(1, "task_queue"))
+  EngineService(std::make_shared<cortex::DylibPathManager>())
       .RegisterEngineLibPath();
 
   std::string p = cortex_utils::GetCurrentPath() + "/" + exe;

engine/services/engine_service.cc

@@ -301,21 +301,25 @@ cpp::result<void, std::string> EngineService::DownloadEngine(
       meta << "name: " << variant.value() << std::endl;
       meta << "version: " << selected_variant->version << std::endl;
       meta.close();
-      namespace fs = std::filesystem;
 
-      fs::path bin_path = extract_path / "build" / "bin";
-      if (fs::exists(bin_path)) {
-        for (const auto& entry : fs::directory_iterator(bin_path)) {
+      std::filesystem::path bin_path = extract_path / "build" / "bin";
+      if (std::filesystem::exists(bin_path)) {
+        for (const auto& entry :
+             std::filesystem::directory_iterator(bin_path)) {
           if (entry.is_regular_file()) {
-            fs::path target_file = extract_path / entry.path().filename();
-            fs::copy_file(entry.path(), target_file,
-                          fs::copy_options::overwrite_existing);
+            std::filesystem::path target_file =
+                extract_path / entry.path().filename();
+            std::filesystem::copy_file(
+                entry.path(), target_file,
+                std::filesystem::copy_options::overwrite_existing);
           }
         }
         std::filesystem::remove_all(bin_path.parent_path());
       }
-      if (!fs::exists(extract_path.parent_path().parent_path() / "deps")) {
-        fs::create_directory(extract_path.parent_path().parent_path() / "deps");
+      if (!std::filesystem::exists(extract_path.parent_path().parent_path() /
+                                   "deps")) {
+        std::filesystem::create_directory(
+            extract_path.parent_path().parent_path() / "deps");
       }
       std::filesystem::permissions(extract_path / kLlamaServer,
                                    std::filesystem::perms::owner_exec |

engine/services/engine_service.h

@@ -64,7 +64,7 @@ class EngineService : public EngineServiceI {
   std::shared_ptr<cortex::TaskQueue> q_ = nullptr;
 
  public:
-  explicit EngineService(
+  EngineService(
       std::shared_ptr<DownloadService> download_service,
       std::shared_ptr<cortex::DylibPathManager> dylib_path_manager,
       std::shared_ptr<DatabaseService> db_service,
@@ -77,6 +77,9 @@ class EngineService : public EngineServiceI {
         db_service_(db_service),
         q_(q) {}
 
+  EngineService(std::shared_ptr<cortex::DylibPathManager> dylib_path_manager)
+      : dylib_path_manager_(dylib_path_manager) {}
+
   std::vector<EngineInfo> GetEngineInfoList() const;
 
   /**

engine/services/hardware_service.cc

@@ -203,12 +203,7 @@ bool HardwareService::Restart(const std::string& host, int port) {
 #else
   std::vector<std::string> commands;
   // Some engines requires to add lib search path before process being created
-  auto download_srv = std::make_shared<DownloadService>();
-  auto dylib_path_mng = std::make_shared<cortex::DylibPathManager>();
-  auto db_srv = std::make_shared<DatabaseService>();
-  // TODO(sang) refactor this
-  EngineService(download_srv, dylib_path_mng, db_srv,
-                std::make_shared<cortex::TaskQueue>(1, "task_queue"))
+  EngineService(std::make_shared<cortex::DylibPathManager>())
       .RegisterEngineLibPath();
   std::string p = cortex_utils::GetCurrentPath() / exe;
   commands.push_back(p);