refactor

include/providers/s3/s3_provider.hpp

@@ -61,6 +61,12 @@ private:
                   bool &is_encrypted, std::string &object_name,
                   head_object_result &result) const -> api_error;
 
+  [[nodiscard]] auto
+  get_object_list(std::string &response_data, long &response_code,
+                  std::optional<std::string> delimiter = std::nullopt,
+                  std::optional<std::string> prefix = std::nullopt) const
+      -> bool;
+
 public:
   [[nodiscard]] auto create_directory(const std::string &api_path,
                                       api_meta_map &meta) -> api_error override;

src/providers/s3/s3_provider.cpp

@@ -40,34 +40,6 @@
 #include "utils/string_utils.hpp"
 
 namespace repertory {
-namespace {
-[[nodiscard]] auto
-get_object_list(i_http_comm &client, const s3_config &config,
-                std::string &response_data, long &response_code,
-                std::optional<std::string> delimiter = std::nullopt,
-                std::optional<std::string> prefix = std::nullopt) -> bool {
-  curl::requests::http_get get{};
-  get.allow_timeout = true;
-  get.aws_service = "aws:amz:" + config.region + ":s3";
-  get.path = '/';
-  get.query["list-type"] = "2";
-  if (delimiter.has_value() && not delimiter.value().empty()) {
-    get.query["delimiter"] = delimiter.value();
-  }
-  if (prefix.has_value() && not prefix.value().empty()) {
-    get.query["prefix"] = prefix.value();
-    utils::string::left_trim(get.query["prefix"], '/');
-  }
-  get.response_handler = [&response_data](const data_buffer &data,
-                                          long /*response_code*/) {
-    response_data = std::string(data.begin(), data.end());
-  };
-
-  stop_type stop_requested{};
-  return client.make_request(get, response_code, stop_requested);
-}
-} // namespace
-
 s3_provider::s3_provider(app_config &config, i_http_comm &comm)
     : base_provider(config, comm) {
   get_comm().enable_s3_path_style(config.get_s3_config().use_path_style);
@@ -321,8 +293,7 @@ auto s3_provider::get_directory_item_count(const std::string &api_path) const
     long response_code{};
     auto prefix = object_name.empty() ? object_name : object_name + "/";
 
-    if (not get_object_list(get_comm(), get_config().get_s3_config(),
+    if (not get_object_list(response_data, response_code, "/", prefix)) {
-                            response_data, response_code, "/", prefix)) {
       return 0U;
     }
 
@@ -390,8 +361,7 @@ auto s3_provider::get_directory_items(const std::string &api_path,
     long response_code{};
     auto prefix = object_name.empty() ? object_name : object_name + "/";
 
-    if (not get_object_list(get_comm(), get_config().get_s3_config(),
+    if (not get_object_list(response_data, response_code, "/", prefix)) {
-                            response_data, response_code, "/", prefix)) {
       return api_error::comm_error;
     }
 
@@ -540,8 +510,7 @@ auto s3_provider::get_file(const std::string &api_path, api_file &file) const
 auto s3_provider::get_file_list(api_file_list &list) const -> api_error {
   std::string response_data;
   long response_code{};
-  if (not get_object_list(get_comm(), get_config().get_s3_config(),
+  if (not get_object_list(response_data, response_code)) {
-                          response_data, response_code)) {
     return api_error::comm_error;
   }
 
@@ -646,6 +615,32 @@ auto s3_provider::get_object_info(bool directory, const std::string &api_path,
   return api_error::error;
 }
 
+auto s3_provider::get_object_list(std::string &response_data,
+                                  long &response_code,
+                                  std::optional<std::string> delimiter,
+                                  std::optional<std::string> prefix) const
+    -> bool {
+  curl::requests::http_get get{};
+  get.allow_timeout = true;
+  get.aws_service = "aws:amz:" + get_config().get_s3_config().region + ":s3";
+  get.path = '/';
+  get.query["list-type"] = "2";
+  if (delimiter.has_value() && not delimiter.value().empty()) {
+    get.query["delimiter"] = delimiter.value();
+  }
+  if (prefix.has_value() && not prefix.value().empty()) {
+    get.query["prefix"] = prefix.value();
+    utils::string::left_trim(get.query["prefix"], '/');
+  }
+  get.response_handler = [&response_data](const data_buffer &data,
+                                          long /*response_code*/) {
+    response_data = std::string(data.begin(), data.end());
+  };
+
+  stop_type stop_requested{};
+  return get_comm().make_request(get, response_code, stop_requested);
+}
+
 auto s3_provider::get_total_drive_space() const -> std::uint64_t {
   return std::numeric_limits<std::int64_t>::max() / std::int64_t(2);
 }
@@ -653,8 +648,7 @@ auto s3_provider::get_total_drive_space() const -> std::uint64_t {
 auto s3_provider::get_used_drive_space() const -> std::uint64_t {
   std::string response_data;
   long response_code{};
-  if (not get_object_list(get_comm(), get_config().get_s3_config(),
+  if (not get_object_list(response_data, response_code)) {
-                          response_data, response_code)) {
     return 0U;
   }
 

src/providers/sia/sia_provider.cpp

@@ -39,76 +39,6 @@ namespace repertory {
 sia_provider::sia_provider(app_config &config, i_http_comm &comm)
     : base_provider(config, comm) {}
 
-auto sia_provider::get_object_info(const std::string &api_path,
-                                   json &object_info) const -> api_error {
-  try {
-    curl::requests::http_get get{};
-    get.allow_timeout = true;
-    get.path = "/api/bus/objects" + api_path;
-
-    get.response_handler = [&object_info](const data_buffer &data,
-                                          long response_code) {
-      if (response_code == http_error_codes::ok) {
-        object_info = nlohmann::json::parse(data.begin(), data.end());
-      }
-    };
-
-    long response_code{};
-    stop_type stop_requested{};
-    if (not get_comm().make_request(get, response_code, stop_requested)) {
-      return api_error::comm_error;
-    }
-
-    if (response_code == http_error_codes::not_found) {
-      return api_error::item_not_found;
-    }
-
-    if (response_code != http_error_codes::ok) {
-      utils::error::raise_api_path_error(__FUNCTION__, api_path, response_code,
-                                         "failed to get object info");
-      return api_error::comm_error;
-    }
-
-    return api_error::success;
-  } catch (const std::exception &e) {
-    utils::error::raise_api_path_error(__FUNCTION__, api_path, e,
-                                       "failed to get object info");
-  }
-
-  return api_error::error;
-}
-
-auto sia_provider::get_object_list(const std::string &api_path,
-                                   nlohmann::json &object_list) const -> bool {
-  curl::requests::http_get get{};
-  get.allow_timeout = true;
-  get.path = "/api/bus/objects" + api_path + "/";
-
-  get.response_handler = [&object_list](const data_buffer &data,
-                                        long response_code) {
-    if (response_code == http_error_codes::ok) {
-      object_list = nlohmann::json::parse(data.begin(), data.end());
-    }
-  };
-
-  long response_code{};
-  stop_type stop_requested{};
-  if (not get_comm().make_request(get, response_code, stop_requested)) {
-    utils::error::raise_api_path_error(__FUNCTION__, api_path,
-                                       api_error::comm_error,
-                                       "failed to get object list");
-    return false;
-  }
-
-  if (response_code != http_error_codes::ok) {
-    utils::error::raise_api_path_error(__FUNCTION__, api_path, response_code,
-                                       "failed to get object list");
-    return false;
-  }
-
-  return true;
-}
-
 auto sia_provider::create_directory(const std::string &api_path,
                                     api_meta_map &meta) -> api_error {
   bool exists{};
@@ -430,6 +360,76 @@ auto sia_provider::get_file_list(api_file_list &list) const -> api_error {
   return get_files_in_dir("");
 }
 
+auto sia_provider::get_object_info(const std::string &api_path,
+                                   json &object_info) const -> api_error {
+  try {
+    curl::requests::http_get get{};
+    get.allow_timeout = true;
+    get.path = "/api/bus/objects" + api_path;
+
+    get.response_handler = [&object_info](const data_buffer &data,
+                                          long response_code) {
+      if (response_code == http_error_codes::ok) {
+        object_info = nlohmann::json::parse(data.begin(), data.end());
+      }
+    };
+
+    long response_code{};
+    stop_type stop_requested{};
+    if (not get_comm().make_request(get, response_code, stop_requested)) {
+      return api_error::comm_error;
+    }
+
+    if (response_code == http_error_codes::not_found) {
+      return api_error::item_not_found;
+    }
+
+    if (response_code != http_error_codes::ok) {
+      utils::error::raise_api_path_error(__FUNCTION__, api_path, response_code,
+                                         "failed to get object info");
+      return api_error::comm_error;
+    }
+
+    return api_error::success;
+  } catch (const std::exception &e) {
+    utils::error::raise_api_path_error(__FUNCTION__, api_path, e,
+                                       "failed to get object info");
+  }
+
+  return api_error::error;
+}
+
+auto sia_provider::get_object_list(const std::string &api_path,
+                                   nlohmann::json &object_list) const -> bool {
+  curl::requests::http_get get{};
+  get.allow_timeout = true;
+  get.path = "/api/bus/objects" + api_path + "/";
+
+  get.response_handler = [&object_list](const data_buffer &data,
+                                        long response_code) {
+    if (response_code == http_error_codes::ok) {
+      object_list = nlohmann::json::parse(data.begin(), data.end());
+    }
+  };
+
+  long response_code{};
+  stop_type stop_requested{};
+  if (not get_comm().make_request(get, response_code, stop_requested)) {
+    utils::error::raise_api_path_error(__FUNCTION__, api_path,
+                                       api_error::comm_error,
+                                       "failed to get object list");
+    return false;
+  }
+
+  if (response_code != http_error_codes::ok) {
+    utils::error::raise_api_path_error(__FUNCTION__, api_path, response_code,
+                                       "failed to get object list");
+    return false;
+  }
+
+  return true;
+}
+
 auto sia_provider::get_total_drive_space() const -> std::uint64_t {
   try {
     curl::requests::http_get get{};