From b7c87bed824a65777c90fc5a05af13caf155bc29 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 24 Oct 2024 12:44:52 -0500 Subject: [PATCH] refactor --- .../include/providers/base_provider.hpp | 145 ++++++++++-------- .../include/providers/s3/s3_provider.hpp | 2 - .../include/providers/sia/sia_provider.hpp | 2 - 3 files changed, 78 insertions(+), 71 deletions(-) diff --git a/repertory/librepertory/include/providers/base_provider.hpp b/repertory/librepertory/include/providers/base_provider.hpp index fea28a39..abd35439 100644 --- a/repertory/librepertory/include/providers/base_provider.hpp +++ b/repertory/librepertory/include/providers/base_provider.hpp @@ -49,17 +49,18 @@ private: void remove_deleted_files(bool source_only); protected: - [[nodiscard]] static auto - create_api_file(std::string path, std::string key, std::uint64_t size, - std::uint64_t file_time) -> api_file; + [[nodiscard]] static auto create_api_file(std::string path, std::string key, + std::uint64_t size, + std::uint64_t file_time) + -> api_file; [[nodiscard]] static auto create_api_file(std::string path, std::uint64_t size, api_meta_map &meta) -> api_file; - [[nodiscard]] virtual auto - create_directory_impl(const std::string &api_path, - api_meta_map &meta) -> api_error = 0; + [[nodiscard]] virtual auto create_directory_impl(const std::string &api_path, + api_meta_map &meta) + -> api_error = 0; [[nodiscard]] virtual auto create_file_extra(const std::string & /* api_path */, @@ -71,8 +72,8 @@ protected: return api_item_added_; } - [[nodiscard]] auto - get_api_item_added() const -> const api_item_added_callback & { + [[nodiscard]] auto get_api_item_added() const + -> const api_item_added_callback & { return api_item_added_; } @@ -96,23 +97,25 @@ protected: return fm_; } - [[nodiscard]] virtual auto - get_used_drive_space_impl() const -> std::uint64_t = 0; + [[nodiscard]] virtual auto get_used_drive_space_impl() const + -> std::uint64_t = 0; - [[nodiscard]] virtual auto - remove_directory_impl(const std::string &api_path) -> api_error = 0; + [[nodiscard]] virtual auto remove_directory_impl(const std::string &api_path) + -> api_error = 0; - [[nodiscard]] virtual auto - remove_file_impl(const std::string &api_path) -> api_error = 0; + [[nodiscard]] virtual auto remove_file_impl(const std::string &api_path) + -> api_error = 0; - [[nodiscard]] virtual auto - upload_file_impl(const std::string &api_path, const std::string &source_path, - stop_type &stop_requested) -> api_error = 0; + [[nodiscard]] virtual auto upload_file_impl(const std::string &api_path, + const std::string &source_path, + stop_type &stop_requested) + -> api_error = 0; public: - [[nodiscard]] auto create_directory_clone_source_meta( - const std::string &source_api_path, - const std::string &api_path) -> api_error override; + [[nodiscard]] auto + create_directory_clone_source_meta(const std::string &source_api_path, + const std::string &api_path) + -> api_error override; [[nodiscard]] auto create_directory(const std::string &api_path, api_meta_map &meta) -> api_error override; @@ -120,74 +123,82 @@ public: [[nodiscard]] auto create_file(const std::string &api_path, api_meta_map &meta) -> api_error override; - [[nodiscard]] auto - get_api_path_from_source(const std::string &source_path, - std::string &api_path) const -> api_error override; + [[nodiscard]] auto get_api_path_from_source(const std::string &source_path, + std::string &api_path) const + -> api_error override; + + [[nodiscard]] auto get_directory_items(const std::string &api_path, + directory_item_list &list) const + -> api_error override; + + [[nodiscard]] auto get_file_size(const std::string &api_path, + std::uint64_t &file_size) const + -> api_error override; + + [[nodiscard]] auto get_filesystem_item(const std::string &api_path, + bool directory, + filesystem_item &fsi) const + -> api_error override; + + [[nodiscard]] auto get_filesystem_item_and_file(const std::string &api_path, + api_file &f, + filesystem_item &fsi) const + -> api_error override; [[nodiscard]] auto - get_directory_items(const std::string &api_path, - directory_item_list &list) const -> api_error override; + get_filesystem_item_from_source_path(const std::string &source_path, + filesystem_item &fsi) const + -> api_error override; - [[nodiscard]] auto - get_file_size(const std::string &api_path, - std::uint64_t &file_size) const -> api_error override; + [[nodiscard]] auto get_item_meta(const std::string &api_path, + api_meta_map &meta) const + -> api_error override; - [[nodiscard]] auto - get_filesystem_item(const std::string &api_path, bool directory, - filesystem_item &fsi) const -> api_error override; + [[nodiscard]] auto get_item_meta(const std::string &api_path, + const std::string &key, + std::string &value) const + -> api_error override; - [[nodiscard]] auto get_filesystem_item_and_file( - const std::string &api_path, api_file &f, - filesystem_item &fsi) const -> api_error override; - - [[nodiscard]] auto get_filesystem_item_from_source_path( - const std::string &source_path, - filesystem_item &fsi) const -> api_error override; - - [[nodiscard]] auto - get_item_meta(const std::string &api_path, - api_meta_map &meta) const -> api_error override; - - [[nodiscard]] auto - get_item_meta(const std::string &api_path, const std::string &key, - std::string &value) const -> api_error override; - - [[nodiscard]] auto - get_pinned_files() const -> std::vector override; + [[nodiscard]] auto get_pinned_files() const + -> std::vector override; [[nodiscard]] auto get_total_item_count() const -> std::uint64_t override; [[nodiscard]] auto get_used_drive_space() const -> std::uint64_t override; - [[nodiscard]] auto - is_file_writeable(const std::string &api_path) const -> bool override; + [[nodiscard]] auto is_file_writeable(const std::string &api_path) const + -> bool override; - [[nodiscard]] auto - remove_directory(const std::string &api_path) -> api_error override; + [[nodiscard]] auto is_read_only() const -> bool override { return false; } - [[nodiscard]] auto - remove_file(const std::string &api_path) -> api_error override; + [[nodiscard]] auto remove_directory(const std::string &api_path) + -> api_error override; - [[nodiscard]] auto - remove_item_meta(const std::string &api_path, - const std::string &key) -> api_error override; + [[nodiscard]] auto remove_file(const std::string &api_path) + -> api_error override; - [[nodiscard]] auto - set_item_meta(const std::string &api_path, const std::string &key, - const std::string &value) -> api_error override; + [[nodiscard]] auto remove_item_meta(const std::string &api_path, + const std::string &key) + -> api_error override; - [[nodiscard]] auto - set_item_meta(const std::string &api_path, - const api_meta_map &meta) -> api_error override; + [[nodiscard]] auto set_item_meta(const std::string &api_path, + const std::string &key, + const std::string &value) + -> api_error override; + + [[nodiscard]] auto set_item_meta(const std::string &api_path, + const api_meta_map &meta) + -> api_error override; [[nodiscard]] auto start(api_item_added_callback api_item_added, i_file_manager *mgr) -> bool override; void stop() override; - [[nodiscard]] auto - upload_file(const std::string &api_path, const std::string &source_path, - stop_type &stop_requested) -> api_error override; + [[nodiscard]] auto upload_file(const std::string &api_path, + const std::string &source_path, + stop_type &stop_requested) + -> api_error override; }; } // namespace repertory diff --git a/repertory/librepertory/include/providers/s3/s3_provider.hpp b/repertory/librepertory/include/providers/s3/s3_provider.hpp index 097980d3..147b6d59 100644 --- a/repertory/librepertory/include/providers/s3/s3_provider.hpp +++ b/repertory/librepertory/include/providers/s3/s3_provider.hpp @@ -127,8 +127,6 @@ public: [[nodiscard]] auto is_online() const -> bool override; - [[nodiscard]] auto is_read_only() const -> bool override { return false; } - [[nodiscard]] auto is_rename_supported() const -> bool override { return false; }; diff --git a/repertory/librepertory/include/providers/sia/sia_provider.hpp b/repertory/librepertory/include/providers/sia/sia_provider.hpp index d441afdc..f693104e 100644 --- a/repertory/librepertory/include/providers/sia/sia_provider.hpp +++ b/repertory/librepertory/include/providers/sia/sia_provider.hpp @@ -99,8 +99,6 @@ public: [[nodiscard]] auto is_online() const -> bool override; - [[nodiscard]] auto is_read_only() const -> bool override { return false; } - [[nodiscard]] auto is_rename_supported() const -> bool override { return true; }