From 0716a58ff072e0712ef90c3348aa64a06688f723 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sun, 12 Nov 2023 19:36:00 -0600 Subject: [PATCH 1/3] Address compiler warnings #10 --- src/main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 95c25f80..5fe0e344 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,11 +56,11 @@ auto main(int argc, char **argv) -> int { if (argc == 1) { argc++; static std::string cmd(argv[0U]); - static std::vector v({&cmd[0U], "-h"}); - argv = (char **)&v[0U]; + static std::vector v({cmd.data(), "-h"}); + argv = (char **)v.data(); } - auto pt = utils::cli::get_provider_type_from_args(argc, argv); + auto prov = utils::cli::get_provider_type_from_args(argc, argv); std::string data_directory; auto res = utils::cli::parse_string_option( @@ -81,7 +81,7 @@ auto main(int argc, char **argv) -> int { std::string remote_host; std::uint16_t remote_port{}; std::string unique_id; - if ((res == exit_code::success) && (pt == provider_type::remote)) { + if ((res == exit_code::success) && (prov == provider_type::remote)) { std::string data; if ((res = utils::cli::parse_string_option( argc, argv, utils::cli::options::remote_mount_option, data)) == @@ -98,7 +98,7 @@ auto main(int argc, char **argv) -> int { try { remote_port = utils::string::to_uint16(parts[1U]); data_directory = utils::path::combine( - data_directory.empty() ? app_config::default_data_directory(pt) + data_directory.empty() ? app_config::default_data_directory(prov) : data_directory, {utils::string::replace_copy(unique_id, ':', '_')}); } catch (const std::exception &e) { @@ -111,7 +111,7 @@ auto main(int argc, char **argv) -> int { } #ifdef REPERTORY_ENABLE_S3 - if ((res == exit_code::success) && (pt == provider_type::s3)) { + if ((res == exit_code::success) && (prov == provider_type::s3)) { std::string data; if ((res = utils::cli::parse_string_option(argc, argv, utils::cli::options::name_option, @@ -122,7 +122,7 @@ auto main(int argc, char **argv) -> int { res = exit_code::invalid_syntax; } else { data_directory = utils::path::combine( - data_directory.empty() ? app_config::default_data_directory(pt) + data_directory.empty() ? app_config::default_data_directory(prov) : data_directory, {unique_id}); } @@ -145,11 +145,11 @@ auto main(int argc, char **argv) -> int { idx++) { res = cli::actions::perform_action( utils::cli::options::option_list[idx], argc, argv, data_directory, - pt, unique_id, user, password); + prov, unique_id, user, password); } if (res == exit_code::option_not_found) { - res = cli::actions::mount(argc, argv, data_directory, mount_result, pt, - remote_host, remote_port, unique_id); + res = cli::actions::mount(argc, argv, data_directory, mount_result, + prov, remote_host, remote_port, unique_id); } } } From 8dc3d4466babe9ec7fb3e58188c6b0382002e4ea Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sun, 12 Nov 2023 19:43:52 -0600 Subject: [PATCH 2/3] refactor --- include/providers/s3/s3_provider.hpp | 6 ++ src/providers/s3/s3_provider.cpp | 66 ++++++------- src/providers/sia/sia_provider.cpp | 140 +++++++++++++-------------- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/include/providers/s3/s3_provider.hpp b/include/providers/s3/s3_provider.hpp index 7bb54ddc..36f73ed5 100644 --- a/include/providers/s3/s3_provider.hpp +++ b/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 delimiter = std::nullopt, + std::optional prefix = std::nullopt) const + -> bool; + public: [[nodiscard]] auto create_directory(const std::string &api_path, api_meta_map &meta) -> api_error override; diff --git a/src/providers/s3/s3_provider.cpp b/src/providers/s3/s3_provider.cpp index ee1963cb..cc4c788b 100644 --- a/src/providers/s3/s3_provider.cpp +++ b/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 delimiter = std::nullopt, - std::optional 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(), - response_data, response_code, "/", prefix)) { + if (not get_object_list(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(), - response_data, response_code, "/", prefix)) { + if (not get_object_list(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(), - response_data, response_code)) { + if (not get_object_list(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 delimiter, + std::optional 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::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(), - response_data, response_code)) { + if (not get_object_list(response_data, response_code)) { return 0U; } diff --git a/src/providers/sia/sia_provider.cpp b/src/providers/sia/sia_provider.cpp index c1c79ace..d5c1e53d 100644 --- a/src/providers/sia/sia_provider.cpp +++ b/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{}; From 04aa511448c652c0a8ded51470ad9e9ca964f5e7 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sun, 12 Nov 2023 19:44:58 -0600 Subject: [PATCH 3/3] Address compiler warnings #10 --- src/providers/s3/s3_provider.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/providers/s3/s3_provider.cpp b/src/providers/s3/s3_provider.cpp index cc4c788b..d8c70588 100644 --- a/src/providers/s3/s3_provider.cpp +++ b/src/providers/s3/s3_provider.cpp @@ -346,7 +346,7 @@ auto s3_provider::get_directory_items(const std::string &api_path, const auto is_encrypted = not cfg.encryption_token.empty(); std::string key; if (is_encrypted) { - auto res = get_item_meta(api_path, META_KEY, key); + res = get_item_meta(api_path, META_KEY, key); if (res != api_error::success) { return res; } @@ -388,8 +388,8 @@ auto s3_provider::get_directory_items(const std::string &api_path, std::string child_object_name; if (is_encrypted) { child_object_name = child_api_path; - auto res = utils::encryption::decrypt_file_path(cfg.encryption_token, - child_api_path); + res = utils::encryption::decrypt_file_path(cfg.encryption_token, + child_api_path); if (res != api_error::success) { return res; } @@ -400,7 +400,7 @@ auto s3_provider::get_directory_items(const std::string &api_path, dir_item.api_parent = utils::path::get_parent_api_path(dir_item.api_path); dir_item.directory = directory; dir_item.size = get_size(dir_item); - auto res = get_item_meta(child_api_path, dir_item.meta); + res = get_item_meta(child_api_path, dir_item.meta); if (res == api_error::item_not_found) { if (directory) { res = create_path_directories(child_api_path, child_object_name);