Driver: replace use json operator <<

Signed-off-by: howe <[email protected]>

Author: hzhyhx1117

src/libmodelbox/base/drivers/driver.cc

@@ -520,7 +520,16 @@ Status Drivers::GatherScanInfo(const std::string &scan_path) {
   }
 
   nlohmann::json dump_json;
-  scan_info_file >> dump_json;
+  try {
+    std::string ss((std::istreambuf_iterator<char>(scan_info_file)),
+                   std::istreambuf_iterator<char>());
+    dump_json = nlohmann::json::parse(ss);
+
+  } catch (const std::exception &e) {
+    auto err_msg = "gather scan info failed, err: " + std::string(e.what());
+    MBLOG_ERROR << err_msg;
+    return {STATUS_FAULT, err_msg};
+  }
 
   auto driver_json_arr = dump_json["scan_drivers"];
   for (auto &driver_info : driver_json_arr) {
@@ -555,8 +564,22 @@ void Drivers::FillCheckInfo(std::string &file_check_node,
                             std::unordered_map<std::string, bool> &file_map,
                             int64_t &ld_cache_time) {
   std::ifstream scan_info(DEFAULT_SCAN_INFO);
+  if (!scan_info.is_open()) {
+    MBLOG_ERROR << "open " << DEFAULT_SCAN_INFO << " failed.";
+    return;
+  }
+
   nlohmann::json dump_json;
-  scan_info >> dump_json;
+  try {
+    std::string ss((std::istreambuf_iterator<char>(scan_info)),
+                   std::istreambuf_iterator<char>());
+    dump_json = nlohmann::json::parse(ss);
+  } catch (const std::exception &e) {
+    MBLOG_ERROR << "filee check info parse " << DEFAULT_SCAN_INFO
+                << " failed, err: " << e.what();
+    return;
+  }
+
   file_check_node = dump_json["check_code"];
   ld_cache_time = dump_json["ld_cache_time"];
   auto driver_json_arr = dump_json["scan_drivers"];
@@ -671,10 +694,19 @@ void Drivers::PrintScanResults(const std::string &scan_path) {
   std::ifstream scan_info_file(scan_path);
   if (!scan_info_file.is_open()) {
     MBLOG_ERROR << "Open file " << scan_path << " for read failed";
+    return;
   }
 
   nlohmann::json dump_json;
-  scan_info_file >> dump_json;
+  try {
+    std::string ss((std::istreambuf_iterator<char>(scan_info_file)),
+                   std::istreambuf_iterator<char>());
+    dump_json = nlohmann::json::parse(ss);
+
+  } catch (const std::exception &e) {
+    MBLOG_ERROR << "print scan result failed, err: " << e.what();
+    return;
+  }
 
   nlohmann::json dump_driver_json_arr = nlohmann::json::array();
   dump_driver_json_arr = dump_json["scan_drivers"];

thirdparty/CMake/local-package.in

@@ -85,7 +85,7 @@ ExternalProject_Add(
 # nlohmann json
 ExternalProject_Add(
   nlohmann
-  URL               @LOCAL_PACKAGE_PATH@/v3.7.3.tar.gz
+  URL               @LOCAL_PACKAGE_PATH@/json-3.10.5.tar.gz
   SOURCE_DIR         ${THIRDPARTY_DOWNLOAD_DIR}/nlohmann
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""

thirdparty/CMake/pre-download.in

@@ -33,7 +33,7 @@ if (NOT @USE_CN_MIRROR@)
   set(TINYLOG_DOWNLOAD_URL "https://github.com/pymumu/tinylog/archive/refs/tags/v1.6.zip")
   set(PYBIND11_DOWNLOAD_URL "https://github.com/pybind/pybind11/archive/refs/tags/v2.9.1.zip")
   set(TOML11_DOWNLOAD_URL "https://github.com/ToruNiina/toml11/archive/refs/tags/v3.7.1.zip")
-  set(NLOHMANN_DOWNLOAD_URL "https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip")
+  set(NLOHMANN_DOWNLOAD_URL "https://github.com/nlohmann/json/releases/download/v3.10.5/include.zip")
   set(CPP_HTTPLIB_DOWNLOAD_URL "https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.10.4.zip")
   set(APIGW_CPP_SDK_DOWNLOAD_URL "https://github.com/modelbox-ai/modelbox-binary/releases/download/BinaryArchive/APIGW-cpp-sdk.zip")
   set(MODELBOX_WEBUI_DOWNLOAD_URL "https://github.com/modelbox-ai/modelbox-webui/archive/refs/tags/0.0.4.zip")
@@ -44,7 +44,7 @@ else()
   set(TINYLOG_DOWNLOAD_URL "https://download.fastgit.org/pymumu/tinylog/archive/refs/tags/v1.6.zip")
   set(PYBIND11_DOWNLOAD_URL "https://gitcode.net/mirrors/pybind/pybind11/-/archive/v2.9.1/pybind11-v2.9.1.zip")
   set(TOML11_DOWNLOAD_URL "https://download.fastgit.org/ToruNiina/toml11/archive/refs/tags/v3.7.1.zip")
-  set(NLOHMANN_DOWNLOAD_URL "https://gitcode.net/mirrors/nlohmann/json/-/archive/v3.7.3/json-v3.7.3.zip")
+  set(NLOHMANN_DOWNLOAD_URL "https://gitcode.net/mirrors/nlohmann/json/-/archive/v3.10.5/json-v3.10.5.zip")
   set(CPP_HTTPLIB_DOWNLOAD_URL "https://gitcode.net/mirrors/yhirose/cpp-httplib/-/archive/v0.10.4/cpp-httplib-v0.10.4.zip")
   set(APIGW_CPP_SDK_DOWNLOAD_URL "https://obs.cn-north-1.myhuaweicloud.com/apig-sdk/APIGW-cpp-sdk.zip")
   set(MODELBOX_WEBUI_DOWNLOAD_URL "https://gitee.com/modelbox/modelbox-webui/repository/archive/main.zip")