From e14e7e96c70f247655f85300c30e086398d8d550 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Fri, 2 Aug 2024 14:39:45 -0500
Subject: [PATCH] updated build system

---
 .../librepertory/include/comm/packet/packet_server.hpp     | 3 +--
 repertory/librepertory/include/platform/platform.hpp       | 2 ++
 repertory/librepertory/include/utils/error_utils.hpp       | 1 -
 repertory/librepertory/include/utils/utils.hpp             | 3 ---
 repertory/librepertory/src/app_config.cpp                  | 2 +-
 repertory/librepertory/src/comm/packet/packet.cpp          | 7 +++----
 repertory/librepertory/src/drives/eviction.cpp             | 2 +-
 .../src/file_manager/file_manager_open_file.cpp            | 2 +-
 .../file_manager/file_manager_ring_buffer_open_file.cpp    | 2 +-
 .../librepertory/src/file_manager/file_manager_upload.cpp  | 2 +-
 repertory/librepertory/src/platform/unix_platform.cpp      | 2 +-
 repertory/librepertory/src/utils/native_file.cpp           | 2 +-
 repertory/repertory_test/src/config_test.cpp               | 7 ++++++-
 .../src/file_manager_ring_buffer_open_file_test.cpp        | 2 +-
 14 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/repertory/librepertory/include/comm/packet/packet_server.hpp b/repertory/librepertory/include/comm/packet/packet_server.hpp
index 3c2c2d54..04e9b988 100644
--- a/repertory/librepertory/include/comm/packet/packet_server.hpp
+++ b/repertory/librepertory/include/comm/packet/packet_server.hpp
@@ -23,8 +23,7 @@
 #define INCLUDE_COMM_PACKET_PACKET_SERVER_HPP_
 
 #include "comm/packet/client_pool.hpp"
-#include "types/repertory.hpp"
-#include "utils/utils.hpp"
+#include "utils/common.hpp"
 
 using namespace boost::asio;
 using boost::asio::ip::tcp;
diff --git a/repertory/librepertory/include/platform/platform.hpp b/repertory/librepertory/include/platform/platform.hpp
index 184ae0d4..fb6d6224 100644
--- a/repertory/librepertory/include/platform/platform.hpp
+++ b/repertory/librepertory/include/platform/platform.hpp
@@ -25,6 +25,8 @@
 #include "platform/unix_platform.hpp"
 #include "platform/win32_platform.hpp"
 #include "utils/unix.hpp"
+#include "utils/unix/unix_utils.hpp"
 #include "utils/windows.hpp"
+#include "utils/windows/windows_utils.hpp"
 
 #endif // INCLUDE_PLATFORM_PLATFORM_HPP_
diff --git a/repertory/librepertory/include/utils/error_utils.hpp b/repertory/librepertory/include/utils/error_utils.hpp
index 0c547b0e..3cdd736a 100644
--- a/repertory/librepertory/include/utils/error_utils.hpp
+++ b/repertory/librepertory/include/utils/error_utils.hpp
@@ -23,7 +23,6 @@
 #define INCLUDE_UTILS_ERROR_UTILS_HPP_
 
 #include "types/repertory.hpp"
-#include "utils/error.hpp"
 
 namespace repertory::utils::error {
 void raise_error(std::string_view function, std::string_view msg);
diff --git a/repertory/librepertory/include/utils/utils.hpp b/repertory/librepertory/include/utils/utils.hpp
index eded0e3b..5d4ac1a2 100644
--- a/repertory/librepertory/include/utils/utils.hpp
+++ b/repertory/librepertory/include/utils/utils.hpp
@@ -22,10 +22,7 @@
 #ifndef INCLUDE_UTILS_UTILS_HPP_
 #define INCLUDE_UTILS_UTILS_HPP_
 
-#include "types/remote.hpp"
 #include "types/repertory.hpp"
-#include "utils/unix/unix_utils.hpp"
-#include "utils/windows/windows_utils.hpp"
 
 namespace repertory::utils {
 void calculate_allocation_size(bool directory, std::uint64_t file_size,
diff --git a/repertory/librepertory/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp
index 3dbf7c54..9fc65531 100644
--- a/repertory/librepertory/src/app_config.cpp
+++ b/repertory/librepertory/src/app_config.cpp
@@ -21,11 +21,11 @@
 */
 #include "app_config.hpp"
 
+#include "platform/platform.hpp"
 #include "types/startup_exception.hpp"
 #include "utils/error_utils.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
-#include "utils/unix/unix_utils.hpp"
 #include "utils/utils.hpp"
 
 namespace {
diff --git a/repertory/librepertory/src/comm/packet/packet.cpp b/repertory/librepertory/src/comm/packet/packet.cpp
index 1c594a44..6d45c93a 100644
--- a/repertory/librepertory/src/comm/packet/packet.cpp
+++ b/repertory/librepertory/src/comm/packet/packet.cpp
@@ -21,13 +21,12 @@
 */
 #include "comm/packet/packet.hpp"
 
-#include "events/event_system.hpp"
-#include "events/events.hpp"
+#include "platform/platform.hpp"
 #include "types/remote.hpp"
 #include "types/repertory.hpp"
-#include "utils/encrypt.hpp"
+#include "utils/encryption.hpp"
 #include "utils/error_utils.hpp"
-#include "utils/utils.hpp"
+#include "utils/string.hpp"
 
 namespace repertory {
 void packet::clear() {
diff --git a/repertory/librepertory/src/drives/eviction.cpp b/repertory/librepertory/src/drives/eviction.cpp
index ab44bf19..ceb0eab5 100644
--- a/repertory/librepertory/src/drives/eviction.cpp
+++ b/repertory/librepertory/src/drives/eviction.cpp
@@ -23,12 +23,12 @@
 
 #include "app_config.hpp"
 #include "file_manager/i_file_manager.hpp"
+#include "platform/platform.hpp"
 #include "providers/i_provider.hpp"
 #include "types/repertory.hpp"
 #include "utils/error_utils.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/time.hpp"
-#include "utils/unix/unix_utils.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {
diff --git a/repertory/librepertory/src/file_manager/file_manager_open_file.cpp b/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
index 53489a48..4fa87095 100644
--- a/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
@@ -22,6 +22,7 @@
 #include "file_manager/file_manager.hpp"
 
 #include "file_manager/events.hpp"
+#include "platform/platform.hpp"
 #include "providers/i_provider.hpp"
 #include "types/repertory.hpp"
 #include "types/startup_exception.hpp"
@@ -29,7 +30,6 @@
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
 #include "utils/time.hpp"
-#include "utils/unix/unix_utils.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {
diff --git a/repertory/librepertory/src/file_manager/file_manager_ring_buffer_open_file.cpp b/repertory/librepertory/src/file_manager/file_manager_ring_buffer_open_file.cpp
index 3106cfb8..26d99289 100644
--- a/repertory/librepertory/src/file_manager/file_manager_ring_buffer_open_file.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager_ring_buffer_open_file.cpp
@@ -23,12 +23,12 @@
 
 #include "app_config.hpp"
 #include "file_manager/events.hpp"
+#include "platform/platform.hpp"
 #include "providers/i_provider.hpp"
 #include "types/repertory.hpp"
 #include "utils/encrypting_reader.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
-#include "utils/unix/unix_utils.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {
diff --git a/repertory/librepertory/src/file_manager/file_manager_upload.cpp b/repertory/librepertory/src/file_manager/file_manager_upload.cpp
index eb19e168..d098b8ee 100644
--- a/repertory/librepertory/src/file_manager/file_manager_upload.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager_upload.cpp
@@ -21,10 +21,10 @@
 */
 #include "file_manager/file_manager.hpp"
 
+#include "platform/platform.hpp"
 #include "providers/i_provider.hpp"
 #include "utils/error_utils.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/unix/unix_utils.hpp"
 
 namespace repertory {
 using std::bind;
diff --git a/repertory/librepertory/src/platform/unix_platform.cpp b/repertory/librepertory/src/platform/unix_platform.cpp
index 41eb6e66..d3557fa0 100644
--- a/repertory/librepertory/src/platform/unix_platform.cpp
+++ b/repertory/librepertory/src/platform/unix_platform.cpp
@@ -30,7 +30,7 @@
 #include "utils/error_utils.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
-#include "utils/unix/unix_utils.hpp"
+#include "utils/unix.hpp"
 
 namespace repertory {
 lock_data::lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
diff --git a/repertory/librepertory/src/utils/native_file.cpp b/repertory/librepertory/src/utils/native_file.cpp
index bd7871a9..ec56a68e 100644
--- a/repertory/librepertory/src/utils/native_file.cpp
+++ b/repertory/librepertory/src/utils/native_file.cpp
@@ -21,9 +21,9 @@
 */
 #include "utils/native_file.hpp"
 
+#include "platform/platform.hpp"
 #include "types/repertory.hpp"
 #include "utils/string.hpp"
-#include "utils/unix/unix_utils.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {
diff --git a/repertory/repertory_test/src/config_test.cpp b/repertory/repertory_test/src/config_test.cpp
index bcc44c71..74c258a7 100644
--- a/repertory/repertory_test/src/config_test.cpp
+++ b/repertory/repertory_test/src/config_test.cpp
@@ -22,13 +22,16 @@
 #include "test_common.hpp"
 
 #include "app_config.hpp"
+#include "events/event_system.hpp"
+#include "utils/common.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
-#include "utils/string.hpp"
 
 namespace repertory {
 class config_test : public ::testing::Test {
 public:
+  static console_consumer cs;
+
   std::string s3_directory{
       utils::path::combine(get_test_dir(), {"config_test", "s3"})};
 
@@ -36,6 +39,7 @@ public:
       utils::path::combine(get_test_dir(), {"config_test", "sia"})};
 
   void SetUp() override {
+    event_system::instance().start();
     ASSERT_TRUE(utils::file::delete_directory_recursively(
         utils::path::combine(get_test_dir(), {"config_test"})));
   }
@@ -43,6 +47,7 @@ public:
   void TearDown() override {
     ASSERT_TRUE(utils::file::delete_directory_recursively(
         utils::path::combine(get_test_dir(), {"config_test"})));
+    event_system::instance().stop();
   }
 };
 
diff --git a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
index 900e28ed..1feb683b 100644
--- a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
+++ b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
@@ -24,9 +24,9 @@
 #include "file_manager/file_manager.hpp"
 #include "mocks/mock_provider.hpp"
 #include "mocks/mock_upload_manager.hpp"
+#include "platform/platform.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
-#include "utils/unix/unix_utils.hpp"
 
 namespace repertory {
 static constexpr const std::size_t test_chunk_size = 1024u;