refactor

2024-12-03 14:02:51 -06:00
parent ae3b592cf6
commit 62857e1372
2 changed files with 254 additions and 189 deletions
--- a/repertory/librepertory/include/providers/base_provider.hpp
+++ b/repertory/librepertory/include/providers/base_provider.hpp
@ -32,6 +32,13 @@ class i_file_manager;
 class i_http_comm;

 class base_provider : public i_provider {
+private:
+  struct removed_item final {
+    std::string api_path;
+    bool directory{};
+    std::string source_path;
+  };
+
 public:
  base_provider(app_config &config, i_http_comm &comm)
      : config_(config), comm_(comm) {}
@ -46,20 +53,35 @@ private:
  i_file_manager *fm_{};

 private:
-  void remove_deleted_files(const stop_type &stop_requested);
+  void add_all_items(const stop_type &stop_requested);
+
+  void get_removed_items(std::deque<removed_item> &directories,
+                         std::deque<removed_item> &files,
+                         const stop_type &stop_requested) const;
+
+  void process_removed_directories(std::deque<removed_item> &removed_list,
+                                   const stop_type &stop_requested);
+
+  void process_removed_files(std::deque<removed_item> &removed_list,
+                             const stop_type &stop_requested);
+
+  void remove_deleted_items(const stop_type &stop_requested);
+
+  void remove_unmatched_source_files(const stop_type &stop_requested);

 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 +93,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_;
  }

@ -98,20 +120,22 @@ protected:
    return fm_;
  }

-  [[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;
@ -119,76 +143,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<std::string> override;
+  [[nodiscard]] auto get_pinned_files() const
+      -> std::vector<std::string> 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 is_read_only() const -> bool override { return false; }

-  [[nodiscard]] auto
-  remove_directory(const std::string &api_path) -> api_error override;
+  [[nodiscard]] auto remove_directory(const std::string &api_path)
+      -> api_error override;

-  [[nodiscard]] auto
-  remove_file(const std::string &api_path) -> api_error override;
+  [[nodiscard]] auto remove_file(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_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 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;

-  [[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;

  [[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