fuse test changes

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

@@ -29,6 +29,9 @@
 
 namespace repertory {
 class encrypt_provider final : public i_provider {
+public:
+  static const constexpr auto type{provider_type::encrypt};
+
 public:
   explicit encrypt_provider(app_config &config);
 
@@ -81,74 +84,68 @@ public:
   [[nodiscard]] auto create_directory(const std::string &api_path,
                                       api_meta_map &meta) -> api_error override;
 
-  [[nodiscard]] auto
-  create_directory_clone_source_meta(const std::string & /*source_api_path*/,
-                                     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 {
+  [[nodiscard]] auto create_directory_clone_source_meta(
+      const std::string & /*source_api_path*/,
+      const std::string & /*api_path*/) -> api_error override {
     return api_error::not_implemented;
   }
 
   [[nodiscard]] auto
-  get_api_path_from_source(const std::string & /*source_path*/,
-                           std::string & /*api_path*/) const
-      -> api_error override;
+  create_file(const std::string & /*api_path*/,
+              api_meta_map & /*meta*/) -> api_error override {
+    return api_error::not_implemented;
+  }
+
+  [[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 get_directory_items(const std::string &api_path,
-                                         directory_item_list &list) 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(const std::string &api_path, api_file &file) const
-      -> 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(const std::string &api_path,
+                              api_file &file) const -> api_error override;
 
   [[nodiscard]] auto
-  get_filesystem_item_from_source_path(const std::string &source_path,
-                                       filesystem_item &fsi) const
-      -> api_error override;
+  get_file_list(api_file_list &list) const -> api_error override;
 
-  [[nodiscard]] auto get_pinned_files() const
-      -> std::vector<std::string> 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 &file,
+      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_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;
 
   [[nodiscard]] auto get_total_item_count() const -> std::uint64_t override;
 
   [[nodiscard]] auto get_provider_type() const -> provider_type override {
-    return provider_type::encrypt;
+    return type;
   }
 
   [[nodiscard]] auto get_used_drive_space() const -> std::uint64_t override;
@@ -158,54 +155,52 @@ public:
   [[nodiscard]] auto is_directory(const std::string &api_path,
                                   bool &exists) const -> api_error override;
 
-  [[nodiscard]] auto is_file(const std::string &api_path, bool &exists) const
-      -> api_error override;
+  [[nodiscard]] auto is_file(const std::string &api_path,
+                             bool &exists) const -> api_error 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 is_online() const -> bool override;
 
   [[nodiscard]] auto is_rename_supported() const -> bool override;
 
-  [[nodiscard]] auto read_file_bytes(const std::string &api_path,
-                                     std::size_t size, std::uint64_t offset,
-                                     data_buffer &data,
-                                     stop_type &stop_requested)
-      -> api_error override;
+  [[nodiscard]] auto
+  read_file_bytes(const std::string &api_path, 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 {
+  [[nodiscard]] auto
+  remove_directory(const std::string & /*api_path*/) -> api_error override {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] auto remove_file(const std::string & /*api_path*/)
-      -> api_error override {
+  [[nodiscard]] auto
+  remove_file(const std::string & /*api_path*/) -> api_error override {
     return api_error::not_implemented;
   }
 
-  [[nodiscard]] auto remove_item_meta(const std::string & /*api_path*/,
-                                      const std::string & /*key*/)
-      -> api_error override {
+  [[nodiscard]] auto
+  remove_item_meta(const std::string & /*api_path*/,
+                   const std::string & /*key*/) -> api_error override {
     return api_error::success;
   }
 
-  [[nodiscard]] auto rename_file(const std::string & /*from_api_path*/,
-                                 const std::string & /*to_api_path*/)
-      -> api_error override {
+  [[nodiscard]] auto
+  rename_file(const std::string & /*from_api_path*/,
+              const std::string & /*to_api_path*/) -> api_error override {
     return api_error::not_implemented;
   }
 
-  [[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 std::string & /*key*/,
+                const std::string & /*value*/) -> api_error override {
     return api_error::success;
   }
 
-  [[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 api_meta_map & /*meta*/) -> api_error override {
     return api_error::success;
   }
 
@@ -214,10 +209,10 @@ public:
 
   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 {
     return api_error::not_implemented;
   }
 };

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

@@ -32,6 +32,9 @@ class i_http_comm;
 struct head_object_result;
 
 class s3_provider final : public base_provider {
+public:
+  static const constexpr auto type{provider_type::s3};
+
 public:
   s3_provider(app_config &config, i_http_comm &comm);
 
@@ -104,7 +107,7 @@ public:
   [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
 
   [[nodiscard]] auto get_provider_type() const -> provider_type override {
-    return provider_type::s3;
+    return type;
   }
 
   [[nodiscard]] auto is_direct_only() const -> bool override { return false; }

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

@@ -31,6 +31,9 @@ class i_file_manager;
 class i_http_comm;
 
 class sia_provider : public base_provider {
+public:
+  static const constexpr auto type{provider_type::sia};
+
 public:
   sia_provider(app_config &config, i_http_comm &comm);
 
@@ -50,40 +53,39 @@ private:
                                      nlohmann::json &object_list) const -> bool;
 
 protected:
-  [[nodiscard]] auto create_directory_impl(const std::string &api_path,
-                                           api_meta_map &meta)
-      -> api_error override;
+  [[nodiscard]] auto
+  create_directory_impl(const std::string &api_path,
+                        api_meta_map &meta) -> api_error override;
 
   [[nodiscard]] auto get_directory_items_impl(const std::string &api_path,
                                               directory_item_list &list) const
       -> api_error override;
 
-  [[nodiscard]] auto get_used_drive_space_impl() const
-      -> std::uint64_t override;
+  [[nodiscard]] auto
+  get_used_drive_space_impl() const -> std::uint64_t override;
 
-  [[nodiscard]] auto remove_directory_impl(const std::string &api_path)
-      -> api_error override;
+  [[nodiscard]] auto
+  remove_directory_impl(const std::string &api_path) -> api_error override;
 
-  [[nodiscard]] auto remove_file_impl(const std::string &api_path)
-      -> api_error override;
+  [[nodiscard]] auto
+  remove_file_impl(const std::string &api_path) -> api_error override;
 
-  [[nodiscard]] auto upload_file_impl(const std::string &api_path,
-                                      const std::string &source_path,
-                                      stop_type &stop_requested)
-      -> api_error override;
+  [[nodiscard]] auto
+  upload_file_impl(const std::string &api_path, const std::string &source_path,
+                   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, api_file &file) const
-      -> api_error override;
+  [[nodiscard]] auto get_file(const std::string &api_path,
+                              api_file &file) const -> api_error override;
 
-  [[nodiscard]] auto get_file_list(api_file_list &list) const
-      -> api_error override;
+  [[nodiscard]] auto
+  get_file_list(api_file_list &list) const -> api_error override;
 
   [[nodiscard]] auto get_provider_type() const -> provider_type override {
-    return provider_type::sia;
+    return type;
   }
 
   [[nodiscard]] auto get_total_drive_space() const -> std::uint64_t override;
@@ -93,8 +95,8 @@ public:
   [[nodiscard]] auto is_directory(const std::string &api_path,
                                   bool &exists) const -> api_error override;
 
-  [[nodiscard]] auto is_file(const std::string &api_path, bool &exists) const
-      -> api_error override;
+  [[nodiscard]] auto is_file(const std::string &api_path,
+                             bool &exists) const -> api_error override;
 
   [[nodiscard]] auto is_online() const -> bool override;
 
@@ -102,15 +104,14 @@ public:
     return true;
   }
 
-  [[nodiscard]] auto read_file_bytes(const std::string &api_path,
-                                     std::size_t size, std::uint64_t offset,
-                                     data_buffer &buffer,
-                                     stop_type &stop_requested)
-      -> api_error override;
+  [[nodiscard]] auto
+  read_file_bytes(const std::string &api_path, std::size_t size,
+                  std::uint64_t offset, data_buffer &buffer,
+                  stop_type &stop_requested) -> api_error override;
 
-  [[nodiscard]] auto rename_file(const std::string &from_api_path,
-                                 const std::string &to_api_path)
-      -> api_error override;
+  [[nodiscard]] auto
+  rename_file(const std::string &from_api_path,
+              const std::string &to_api_path) -> api_error override;
 
   [[nodiscard]] auto start(api_item_added_callback api_item_added,
                            i_file_manager *mgr) -> bool override;