revert

include/file_manager/events.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

include/file_manager/file_manager.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -22,11 +22,13 @@
 #ifndef INCLUDE_FILE_MANAGER_FILE_MANAGER_HPP_
 #define INCLUDE_FILE_MANAGER_FILE_MANAGER_HPP_
 
+#include "database/db_common.hpp"
 #include "events/event_system.hpp"
 #include "events/events.hpp"
 #include "file_manager/i_file_manager.hpp"
 #include "file_manager/i_open_file.hpp"
 #include "file_manager/i_upload_manager.hpp"
+#include "platform/platform.hpp"
 #include "types/repertory.hpp"
 #include "utils/native_file.hpp"
 
@@ -133,6 +135,7 @@ public:
     mutable std::mutex io_thread_mtx_;
     std::condition_variable io_thread_notify_;
     std::deque<std::shared_ptr<io_item>> io_thread_queue_;
+    bool removed_{false};
 
   private:
     void file_io_thread();
@@ -246,7 +249,8 @@ public:
                         std::size_t end_chunk_index_inclusive,
                         bool should_reset);
 
-  private:
+    void set_modified();
+
     void update_background_reader(std::size_t read_chunk);
 
   protected:
@@ -266,13 +270,11 @@ public:
 
     auto is_write_supported() const -> bool override { return true; }
 
-    [[nodiscard]] auto
-    native_operation(const native_operation_callback &callback)
+    [[nodiscard]] auto native_operation(native_operation_callback callback)
         -> api_error override;
 
-    [[nodiscard]] auto
-    native_operation(std::uint64_t new_file_size,
-                     const native_operation_callback &callback)
+    [[nodiscard]] auto native_operation(std::uint64_t new_file_size,
+                                        native_operation_callback callback)
         -> api_error override;
 
     void remove(std::uint64_t handle) override;
@@ -361,12 +363,11 @@ public:
 
     auto is_write_supported() const -> bool override { return false; }
 
-    [[nodiscard]] auto
-    native_operation(const native_operation_callback &callback)
+    [[nodiscard]] auto native_operation(native_operation_callback callback)
         -> api_error override;
 
     [[nodiscard]] auto native_operation(std::uint64_t,
-                                        const native_operation_callback &)
+                                        native_operation_callback)
         -> api_error override {
       return api_error::not_supported;
     }
@@ -449,17 +450,14 @@ public:
 private:
   app_config &config_;
   i_provider &provider_;
-  std::unique_ptr<rocksdb::DB> db_;
 
 private:
-  rocksdb::ColumnFamilyHandle *default_family_{};
-  std::uint64_t next_handle_ = 0u;
+  db::db3_t db_{nullptr};
+  std::uint64_t next_handle_{0U};
   mutable std::recursive_mutex open_file_mtx_;
   std::unordered_map<std::string, std::shared_ptr<i_closeable_open_file>>
       open_file_lookup_;
-  stop_type stop_requested_ = false;
-  rocksdb::ColumnFamilyHandle *upload_family_{};
-  rocksdb::ColumnFamilyHandle *upload_active_family_{};
+  stop_type stop_requested_{false};
   std::unordered_map<std::string, std::unique_ptr<upload>> upload_lookup_;
   mutable std::mutex upload_mtx_;
   std::condition_variable upload_notify_;

include/file_manager/i_file_manager.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

include/file_manager/i_open_file.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -40,6 +40,9 @@ public:
 
   [[nodiscard]] virtual auto get_filesystem_item() const -> filesystem_item = 0;
 
+  [[nodiscard]] virtual auto get_open_data() const
+      -> std::map<std::uint64_t, open_file_data> = 0;
+
   [[nodiscard]] virtual auto get_open_data(std::uint64_t handle) const
       -> open_file_data = 0;
 
@@ -58,11 +61,11 @@ public:
   [[nodiscard]] virtual auto has_handle(std::uint64_t handle) const -> bool = 0;
 
   [[nodiscard]] virtual auto
-  native_operation(const native_operation_callback &callback) -> api_error = 0;
+  native_operation(native_operation_callback callback) -> api_error = 0;
 
   [[nodiscard]] virtual auto
   native_operation(std::uint64_t new_file_size,
-                   const native_operation_callback &callback) -> api_error = 0;
+                   native_operation_callback callback) -> api_error = 0;
 
   [[nodiscard]] virtual auto read(std::size_t read_size,
                                   std::uint64_t read_offset, data_buffer &data)
@@ -91,9 +94,6 @@ public:
   [[nodiscard]] virtual auto get_handles() const
       -> std::vector<std::uint64_t> = 0;
 
-  [[nodiscard]] virtual auto get_open_data() const
-      -> std::map<std::uint64_t, open_file_data> = 0;
-
   [[nodiscard]] virtual auto is_complete() const -> bool = 0;
 
   [[nodiscard]] virtual auto is_modified() const -> bool = 0;

include/file_manager/i_upload_manager.hpp

@@ -1,5 +1,5 @@
 /*
-  Copyright <2018-2023> <scott.e.graves@protonmail.com>
+  Copyright <2018-2024> <scott.e.graves@protonmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal