updated build system

repertory/repertory_test/include/mocks/mock_fuse_drive.hpp

@@ -29,7 +29,7 @@
 #include "types/remote.hpp"
 #include "types/repertory.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {

repertory/repertory_test/include/mocks/mock_winfsp_drive.hpp

@@ -27,7 +27,7 @@
 
 #include "drives/winfsp/i_winfsp_drive.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {

repertory/repertory_test/include/utils/event_capture.hpp

@@ -24,6 +24,7 @@
 
 #include "test_common.hpp"
 
+#include "utils/collection.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {
@@ -59,7 +60,7 @@ private:
 public:
   void process_event(const event &event) {
     unique_mutex_lock l(mutex_);
-    utils::remove_element_from(event_names_, event.get_name());
+    utils::collection::remove_element(event_names_, event.get_name());
     fired_event_names_.emplace_back(event.get_name());
     notify_.notify_all();
     l.unlock();

repertory/repertory_test/src/config_test.cpp

@@ -23,8 +23,8 @@
 
 #include "app_config.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
-#include "utils/string_utils.hpp"
+#include "utils/path.hpp"
+#include "utils/string.hpp"
 
 namespace repertory {
 class config_test : public ::testing::Test {

repertory/repertory_test/src/database_test.cpp

@@ -24,7 +24,7 @@
 #include "database/db_common.hpp"
 #include "database/db_insert.hpp"
 #include "database/db_select.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 
 namespace repertory {
 TEST(database, db_insert) {

repertory/repertory_test/src/encrypting_reader_test.cpp

@@ -24,7 +24,7 @@
 #include "types/repertory.hpp"
 #include "utils/encrypting_reader.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 
 namespace repertory {
 static auto get_source_file_name() -> std::string {

repertory/repertory_test/src/file_manager_open_file_test.cpp

@@ -26,7 +26,7 @@
 #include "mocks/mock_upload_manager.hpp"
 #include "types/repertory.hpp"
 #include "utils/event_capture.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 
 namespace repertory {
 static constexpr const std::size_t test_chunk_size = 1024u;

repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp

@@ -25,7 +25,7 @@
 #include "mocks/mock_provider.hpp"
 #include "mocks/mock_upload_manager.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 #include "utils/unix/unix_utils.hpp"
 
 namespace repertory {

repertory/repertory_test/src/file_manager_test.cpp

@@ -33,9 +33,9 @@
 #include "utils/event_capture.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/native_file.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 #include "utils/polling.hpp"
-#include "utils/string_utils.hpp"
+#include "utils/string.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {

repertory/repertory_test/src/file_manager_upload_test.cpp

@@ -25,7 +25,7 @@
 #include "mocks/mock_provider.hpp"
 #include "mocks/mock_upload_manager.hpp"
 #include "utils/event_capture.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 
 namespace repertory {
 static constexpr const std::size_t test_chunk_size = 1024u;

repertory/repertory_test/src/path_utils_test.cpp

@@ -21,7 +21,7 @@
 */
 #include "test_common.hpp"
 
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 
 namespace repertory {
 TEST(path_utils, combine) {

repertory/repertory_test/src/providers_test.cpp

@@ -29,9 +29,10 @@
 #include "providers/i_provider.hpp"
 #include "providers/s3/s3_provider.hpp"
 #include "providers/sia/sia_provider.hpp"
+#include "utils/collection.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
-#include "utils/string_utils.hpp"
+#include "utils/path.hpp"
+#include "utils/string.hpp"
 #include "utils/utils.hpp"
 #include "gtest/gtest.h"
 
@@ -562,8 +563,8 @@ static void get_file_list(const app_config &cfg, i_provider &provider) {
     for (auto &file : list) {
       decrypt_parts(cfg, file.api_parent);
       decrypt_parts(cfg, file.api_path);
-      utils::remove_element_from(expected_parents, file.api_parent);
-      utils::remove_element_from(expected_paths, file.api_path);
+      utils::collection::remove_element(expected_parents, file.api_parent);
+      utils::collection::remove_element(expected_paths, file.api_path);
     }
     EXPECT_TRUE(expected_parents.empty());
     EXPECT_TRUE(expected_paths.empty());

repertory/repertory_test/src/string_utils_test.cpp

@@ -21,7 +21,7 @@
 */
 #include "test_common.hpp"
 
-#include "utils/string_utils.hpp"
+#include "utils/string.hpp"
 
 namespace repertory {
 TEST(string_utils, is_numeric) {

repertory/repertory_test/src/test_common.cpp

@@ -22,7 +22,7 @@
 #include "test_common.hpp"
 
 #include "types/repertory.hpp"
-#include "utils/path_utils.hpp"
+#include "utils/path.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {

repertory/repertory_test/src/utils_test.cpp

@@ -22,8 +22,8 @@
 #include "test_common.hpp"
 
 #include "utils/file_utils.hpp"
-#include "utils/path_utils.hpp"
-#include "utils/string_utils.hpp"
+#include "utils/path.hpp"
+#include "utils/string.hpp"
 #include "utils/utils.hpp"
 
 namespace repertory {