From eae1ef32dbe964f325552563479ca5dcda8e2fd2 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 20 Dec 2024 19:40:02 -0600 Subject: [PATCH] cleanup --- .../src/providers/s3/s3_provider.cpp | 57 +++++++++---------- .../src/rpc/server/full_server.cpp | 1 + repertory/librepertory/src/utils/polling.cpp | 2 + repertory/librepertory/src/utils/utils.cpp | 5 +- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/repertory/librepertory/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp index cc0f31e5..780041c0 100644 --- a/repertory/librepertory/src/providers/s3/s3_provider.cpp +++ b/repertory/librepertory/src/providers/s3/s3_provider.cpp @@ -23,6 +23,8 @@ #include "app_config.hpp" #include "comm/i_http_comm.hpp" +#include "events/event_system.hpp" +#include "events/events.hpp" #include "file_manager/i_file_manager.hpp" #include "types/repertory.hpp" #include "types/s3.hpp" @@ -41,9 +43,8 @@ namespace repertory { s3_provider::s3_provider(app_config &config, i_http_comm &comm) : base_provider(config, comm) {} -auto s3_provider::add_if_not_found(api_file &file, - const std::string &object_name) const - -> api_error { +auto s3_provider::add_if_not_found( + api_file &file, const std::string &object_name) const -> api_error { api_meta_map meta{}; if (get_item_meta(file.api_path, meta) == api_error::item_not_found) { auto err = create_path_directories( @@ -69,7 +70,7 @@ auto s3_provider::convert_api_date(std::string_view date) -> std::uint64_t { utils::string::split(date_parts.at(1U), 'Z', true).at(0U)) * 1000000UL; - struct tm tm1{}; + struct tm tm1 {}; #if defined(_WIN32) utils::time::strptime(date_time.c_str(), "%Y-%m-%dT%T", &tm1); return nanos + utils::time::windows_time_t_to_unix_time(_mkgmtime(&tm1)); @@ -161,9 +162,8 @@ auto s3_provider::create_file_extra(const std::string &api_path, return api_error::success; } -auto s3_provider::create_path_directories(const std::string &api_path, - const std::string &key) const - -> api_error { +auto s3_provider::create_path_directories( + const std::string &api_path, const std::string &key) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); if (api_path == "/") { @@ -330,9 +330,8 @@ auto s3_provider::get_directory_item_count(const std::string &api_path) const return 0U; } -auto s3_provider::get_directory_items_impl(const std::string &api_path, - directory_item_list &list) const - -> api_error { +auto s3_provider::get_directory_items_impl( + const std::string &api_path, directory_item_list &list) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); const auto &cfg = get_s3_config(); @@ -477,8 +476,8 @@ auto s3_provider::get_directory_items_impl(const std::string &api_path, return ret; } -auto s3_provider::get_file(const std::string &api_path, api_file &file) const - -> api_error { +auto s3_provider::get_file(const std::string &api_path, + api_file &file) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try { @@ -517,8 +516,8 @@ auto s3_provider::get_file(const std::string &api_path, api_file &file) const return api_error::error; } -auto s3_provider::get_file_list(api_file_list &list, std::string &marker) const - -> api_error { +auto s3_provider::get_file_list(api_file_list &list, + std::string &marker) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); std::string response_data; @@ -593,9 +592,8 @@ auto s3_provider::get_file_list(api_file_list &list, std::string &marker) const return grab_more ? api_error::more_data : api_error::success; } -auto s3_provider::get_last_modified(bool directory, - const std::string &api_path) const - -> std::uint64_t { +auto s3_provider::get_last_modified( + bool directory, const std::string &api_path) const -> std::uint64_t { bool is_encrypted{}; std::string object_name; head_object_result result{}; @@ -605,10 +603,9 @@ auto s3_provider::get_last_modified(bool directory, : utils::time::get_time_now(); } -auto s3_provider::get_object_info(bool directory, const std::string &api_path, - bool &is_encrypted, std::string &object_name, - head_object_result &result) const - -> api_error { +auto s3_provider::get_object_info( + bool directory, const std::string &api_path, bool &is_encrypted, + std::string &object_name, head_object_result &result) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); try { @@ -657,12 +654,10 @@ 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, - std::optional token) const - -> bool { +auto s3_provider::get_object_list( + std::string &response_data, long &response_code, + std::optional delimiter, std::optional prefix, + std::optional token) const -> bool { curl::requests::http_get get{}; get.allow_timeout = true; get.aws_service = "aws:amz:" + get_s3_config().region + ":s3"; @@ -691,8 +686,8 @@ auto s3_provider::get_total_drive_space() const -> std::uint64_t { return std::numeric_limits::max() / std::int64_t(2); } -auto s3_provider::is_directory(const std::string &api_path, bool &exists) const - -> api_error { +auto s3_provider::is_directory(const std::string &api_path, + bool &exists) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); exists = false; @@ -719,8 +714,8 @@ auto s3_provider::is_directory(const std::string &api_path, bool &exists) const return api_error::error; } -auto s3_provider::is_file(const std::string &api_path, bool &exists) const - -> api_error { +auto s3_provider::is_file(const std::string &api_path, + bool &exists) const -> api_error { REPERTORY_USES_FUNCTION_NAME(); exists = false; diff --git a/repertory/librepertory/src/rpc/server/full_server.cpp b/repertory/librepertory/src/rpc/server/full_server.cpp index 18e3d452..d2e5763f 100644 --- a/repertory/librepertory/src/rpc/server/full_server.cpp +++ b/repertory/librepertory/src/rpc/server/full_server.cpp @@ -26,6 +26,7 @@ #include "providers/i_provider.hpp" #include "types/repertory.hpp" #include "types/rpc.hpp" +#include "utils/error_utils.hpp" #include "utils/file.hpp" #include "utils/path.hpp" diff --git a/repertory/librepertory/src/utils/polling.cpp b/repertory/librepertory/src/utils/polling.cpp index 113925ae..0dfdb4a5 100644 --- a/repertory/librepertory/src/utils/polling.cpp +++ b/repertory/librepertory/src/utils/polling.cpp @@ -22,6 +22,8 @@ #include "utils/polling.hpp" #include "app_config.hpp" +#include "events/event_system.hpp" +#include "events/events.hpp" #include "utils/tasks.hpp" namespace repertory { diff --git a/repertory/librepertory/src/utils/utils.cpp b/repertory/librepertory/src/utils/utils.cpp index 7b6a4909..44ef5f1b 100644 --- a/repertory/librepertory/src/utils/utils.cpp +++ b/repertory/librepertory/src/utils/utils.cpp @@ -24,6 +24,7 @@ #include "app_config.hpp" #include "types/startup_exception.hpp" #include "utils/common.hpp" +#include "utils/error_utils.hpp" #include "utils/file.hpp" #include "utils/path.hpp" #include "utils/string.hpp" @@ -50,8 +51,8 @@ void calculate_allocation_size(bool directory, std::uint64_t file_size, auto create_rocksdb( const app_config &cfg, const std::string &name, const std::vector &families, - std::vector &handles, bool clear) - -> std::unique_ptr { + std::vector &handles, + bool clear) -> std::unique_ptr { REPERTORY_USES_FUNCTION_NAME(); auto db_dir = utils::path::combine(cfg.get_data_directory(), {"db"});