refactor

repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp

@@ -83,61 +83,67 @@ public:
   [[nodiscard]] auto create_directory(const std::string &api_path,
                                       api_meta_map &meta) -> api_error override;
 
-  [[nodiscard]] auto create_directory_clone_source_meta(
+  [[nodiscard]] auto
-      const std::string & /*source_api_path*/,
+  create_directory_clone_source_meta(const std::string & /*source_api_path*/,
-      const std::string & /*api_path*/) -> api_error override {
+                                     const std::string & /*api_path*/)
+      -> api_error override {
+    return api_error::not_implemented;
+  }
+
+  [[nodiscard]] auto create_file(const std::string & /*api_path*/,
+                                 api_meta_map & /*meta*/)
+      -> api_error override {
     return api_error::not_implemented;
   }
 
   [[nodiscard]] auto
-  create_file(const std::string & /*api_path*/,
+  get_api_path_from_source(const std::string & /*source_path*/,
-              api_meta_map & /*meta*/) -> api_error override {
+                           std::string & /*api_path*/) const
-    return api_error::not_implemented;
+      -> 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_item_count(const std::string &api_path) const
       -> std::uint64_t override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_directory_items(const std::string &api_path,
-  get_directory_items(const std::string &api_path,
+                                         directory_item_list &list) const
-                      directory_item_list &list) const -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto get_file(const std::string &api_path,
+  [[nodiscard]] auto get_file(const std::string &api_path, api_file &file) const
-                              api_file &file) const -> api_error override;
+      -> api_error override;
+
+  [[nodiscard]] auto get_file_list(api_file_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 &file,
+                                                  filesystem_item &fsi) const
+      -> api_error override;
 
   [[nodiscard]] auto
-  get_file_list(api_file_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
+  [[nodiscard]] auto get_pinned_files() const
-  get_file_size(const std::string &api_path,
+      -> std::vector<std::string> override;
-                std::uint64_t &file_size) const -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_item_meta(const std::string &api_path,
-  get_filesystem_item(const std::string &api_path, bool directory,
+                                   api_meta_map &meta) const
-                      filesystem_item &fsi) const -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto get_filesystem_item_and_file(
+  [[nodiscard]] auto get_item_meta(const std::string &api_path,
-      const std::string &api_path, api_file &file,
+                                   const std::string &key,
-      filesystem_item &fsi) const -> api_error override;
+                                   std::string &value) 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_pinned_files() const -> std::vector<std::string> 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_total_drive_space() const -> std::uint64_t override;
 
@@ -149,57 +155,61 @@ public:
 
   [[nodiscard]] auto get_used_drive_space() const -> std::uint64_t override;
 
-  [[nodiscard]] auto is_read_only() const -> bool override { return true; }
-
   [[nodiscard]] auto is_directory(const std::string &api_path,
                                   bool &exists) const -> api_error override;
 
-  [[nodiscard]] auto is_file(const std::string &api_path,
+  [[nodiscard]] auto is_file(const std::string &api_path, bool &exists) const
-                             bool &exists) const -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto is_file_writeable(const std::string &api_path) const
-  is_file_writeable(const std::string &api_path) const -> bool override;
+      -> bool override;
 
   [[nodiscard]] auto is_online() const -> bool override;
 
-  [[nodiscard]] auto is_rename_supported() const -> bool override;
+  [[nodiscard]] auto is_read_only() const -> bool override { return true; }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto is_rename_supported() const -> bool override {
-  read_file_bytes(const std::string &api_path, std::size_t size,
+    return false;
-                  std::uint64_t offset, data_buffer &data,
+  }
-                  stop_type &stop_requested) -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto read_file_bytes(const std::string &api_path,
-  remove_directory(const std::string & /*api_path*/) -> api_error override {
+                                     std::size_t size, std::uint64_t offset,
+                                     data_buffer &data,
+                                     stop_type &stop_requested)
+      -> api_error override;
+
+  [[nodiscard]] auto remove_directory(const std::string & /*api_path*/)
+      -> api_error override {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto remove_file(const std::string & /*api_path*/)
-  remove_file(const std::string & /*api_path*/) -> api_error override {
+      -> api_error override {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto remove_item_meta(const std::string & /*api_path*/,
-  remove_item_meta(const std::string & /*api_path*/,
+                                      const std::string & /*key*/)
-                   const std::string & /*key*/) -> api_error override {
+      -> api_error override {
     return api_error::success;
   }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto rename_file(const std::string & /*from_api_path*/,
-  rename_file(const std::string & /*from_api_path*/,
+                                 const std::string & /*to_api_path*/)
-              const std::string & /*to_api_path*/) -> api_error override {
+      -> api_error override {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto set_item_meta(const std::string & /*api_path*/,
-  set_item_meta(const std::string & /*api_path*/, const std::string & /*key*/,
+                                   const std::string & /*key*/,
-                const std::string & /*value*/) -> api_error override {
+                                   const std::string & /*value*/)
+      -> api_error override {
     return api_error::success;
   }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto set_item_meta(const std::string & /*api_path*/,
-  set_item_meta(const std::string & /*api_path*/,
+                                   const api_meta_map & /*meta*/)
-                const api_meta_map & /*meta*/) -> api_error override {
+      -> api_error override {
     return api_error::success;
   }
 
@@ -208,10 +218,10 @@ public:
 
   void stop() override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto upload_file(const std::string & /*api_path*/,
-  upload_file(const std::string & /*api_path*/,
+                                 const std::string & /*source_path*/,
-              const std::string & /*source_path*/,
+                                 stop_type & /*stop_requested*/)
-              stop_type & /*stop_requested*/) -> api_error override {
+      -> api_error override {
     return api_error::not_implemented;
   }
 };

repertory/librepertory/include/providers/s3/s3_provider.hpp

@@ -47,69 +47,71 @@ public:
   auto operator=(s3_provider &&) -> s3_provider & = delete;
 
 private:
-  [[nodiscard]] auto
+  [[nodiscard]] auto add_if_not_found(api_file &file,
-  add_if_not_found(api_file &file,
+                                      const std::string &object_name) const
-                   const std::string &object_name) const -> api_error;
+      -> api_error;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto create_file_extra(const std::string &api_path,
-  create_file_extra(const std::string &api_path,
+                                       api_meta_map &meta)
-                    api_meta_map &meta) -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto create_path_directories(const std::string &api_path,
-  create_path_directories(const std::string &api_path,
+                                             const std::string &key) const
-                          const std::string &key) const -> api_error;
+      -> api_error;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto decrypt_object_name(std::string &object_name) const
-  decrypt_object_name(std::string &object_name) const -> api_error;
+      -> api_error;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_last_modified(bool directory,
-  get_last_modified(bool directory,
+                                       const std::string &api_path) const
-                    const std::string &api_path) const -> std::uint64_t;
+      -> std::uint64_t;
 
   [[nodiscard]] auto
   get_object_info(bool directory, const std::string &api_path,
                   bool &is_encrypted, std::string &object_name,
                   head_object_result &result) const -> api_error;
 
-  [[nodiscard]] auto get_object_list(
+  [[nodiscard]] auto
-      std::string &response_data, long &response_code,
+  get_object_list(std::string &response_data, long &response_code,
-      std::optional<std::string> delimiter = std::nullopt,
+                  std::optional<std::string> delimiter = std::nullopt,
-      std::optional<std::string> prefix = std::nullopt) const -> bool;
+                  std::optional<std::string> prefix = std::nullopt) const
+      -> bool;
 
 protected:
-  [[nodiscard]] auto
+  [[nodiscard]] auto create_directory_impl(const std::string &api_path,
-  create_directory_impl(const std::string &api_path,
+                                           api_meta_map &meta)
-                        api_meta_map &meta) -> api_error override;
+      -> api_error override;
 
   [[nodiscard]] auto get_directory_items_impl(const std::string &api_path,
                                               directory_item_list &list) const
       -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_used_drive_space_impl() const
-  get_used_drive_space_impl() const -> std::uint64_t override;
+      -> std::uint64_t override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto remove_directory_impl(const std::string &api_path)
-  remove_directory_impl(const std::string &api_path) -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto remove_file_impl(const std::string &api_path)
-  remove_file_impl(const std::string &api_path) -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto upload_file_impl(const std::string &api_path,
-  upload_file_impl(const std::string &api_path, const std::string &source_path,
+                                      const std::string &source_path,
-                   stop_type &stop_requested) -> api_error override;
+                                      stop_type &stop_requested)
+      -> api_error override;
 
 public:
-  [[nodiscard]] static auto
+  [[nodiscard]] static auto convert_api_date(std::string_view date)
-  convert_api_date(std::string_view date) -> std::uint64_t;
+      -> std::uint64_t;
 
   [[nodiscard]] auto get_directory_item_count(const std::string &api_path) const
       -> std::uint64_t override;
 
-  [[nodiscard]] auto get_file(const std::string &api_path,
+  [[nodiscard]] auto get_file(const std::string &api_path, api_file &file) const
-                              api_file &file) const -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_file_list(api_file_list &list) const
-  get_file_list(api_file_list &list) const -> api_error override;
+      -> api_error override;
 
   [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
 
@@ -117,28 +119,29 @@ public:
     return type;
   }
 
-  [[nodiscard]] auto is_read_only() const -> bool override { return false; }
-
   [[nodiscard]] auto is_directory(const std::string &api_path,
                                   bool &exists) const -> api_error override;
 
-  [[nodiscard]] auto is_file(const std::string &api_path,
+  [[nodiscard]] auto is_file(const std::string &api_path, bool &exists) const
-                             bool &exists) const -> api_error override;
+      -> api_error override;
 
   [[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;
   };
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto read_file_bytes(const std::string &api_path,
-  read_file_bytes(const std::string &api_path, std::size_t size,
+                                     std::size_t size, std::uint64_t offset,
-                  std::uint64_t offset, data_buffer &data,
+                                     data_buffer &data,
-                  stop_type &stop_requested) -> api_error override;
+                                     stop_type &stop_requested)
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto rename_file(const std::string &from_api_path,
-  rename_file(const std::string &from_api_path,
+                                 const std::string &to_api_path)
-              const std::string &to_api_path) -> api_error override;
+      -> api_error override;
 
   [[nodiscard]] auto start(api_item_added_callback api_item_added,
                            i_file_manager *mgr) -> bool override;

repertory/librepertory/include/providers/sia/sia_provider.hpp

@@ -53,36 +53,37 @@ private:
                                      nlohmann::json &object_list) const -> bool;
 
 protected:
-  [[nodiscard]] auto
+  [[nodiscard]] auto create_directory_impl(const std::string &api_path,
-  create_directory_impl(const std::string &api_path,
+                                           api_meta_map &meta)
-                        api_meta_map &meta) -> api_error override;
+      -> api_error override;
 
   [[nodiscard]] auto get_directory_items_impl(const std::string &api_path,
                                               directory_item_list &list) const
       -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_used_drive_space_impl() const
-  get_used_drive_space_impl() const -> std::uint64_t override;
+      -> std::uint64_t override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto remove_directory_impl(const std::string &api_path)
-  remove_directory_impl(const std::string &api_path) -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto remove_file_impl(const std::string &api_path)
-  remove_file_impl(const std::string &api_path) -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto upload_file_impl(const std::string &api_path,
-  upload_file_impl(const std::string &api_path, const std::string &source_path,
+                                      const std::string &source_path,
-                   stop_type &stop_requested) -> api_error override;
+                                      stop_type &stop_requested)
+      -> api_error override;
 
 public:
   [[nodiscard]] auto get_directory_item_count(const std::string &api_path) const
       -> std::uint64_t override;
 
-  [[nodiscard]] auto get_file(const std::string &api_path,
+  [[nodiscard]] auto get_file(const std::string &api_path, api_file &file) const
-                              api_file &file) const -> api_error override;
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto get_file_list(api_file_list &list) const
-  get_file_list(api_file_list &list) const -> api_error override;
+      -> api_error override;
 
   [[nodiscard]] auto get_provider_type() const -> provider_type override {
     return type;
@@ -90,28 +91,29 @@ public:
 
   [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
 
-  [[nodiscard]] auto is_read_only() const -> bool override { return false; }
-
   [[nodiscard]] auto is_directory(const std::string &api_path,
                                   bool &exists) const -> api_error override;
 
-  [[nodiscard]] auto is_file(const std::string &api_path,
+  [[nodiscard]] auto is_file(const std::string &api_path, bool &exists) const
-                             bool &exists) const -> api_error override;
+      -> api_error override;
 
   [[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;
   }
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto read_file_bytes(const std::string &api_path,
-  read_file_bytes(const std::string &api_path, std::size_t size,
+                                     std::size_t size, std::uint64_t offset,
-                  std::uint64_t offset, data_buffer &buffer,
+                                     data_buffer &buffer,
-                  stop_type &stop_requested) -> api_error override;
+                                     stop_type &stop_requested)
+      -> api_error override;
 
-  [[nodiscard]] auto
+  [[nodiscard]] auto rename_file(const std::string &from_api_path,
-  rename_file(const std::string &from_api_path,
+                                 const std::string &to_api_path)
-              const std::string &to_api_path) -> api_error override;
+      -> api_error override;
 
   [[nodiscard]] auto start(api_item_added_callback api_item_added,
                            i_file_manager *mgr) -> bool override;

repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp

@@ -700,8 +700,6 @@ auto encrypt_provider::is_online() const -> bool {
       .exists();
 }
 
-auto encrypt_provider::is_rename_supported() const -> bool { return false; }
-
 auto encrypt_provider::process_directory_entry(
     const utils::file::i_fs_item &dir_entry, const encrypt_config &cfg,
     std::string &api_path) const -> bool {