Refactoring

yutfut · Dec 19, 2021 · 81b682e · 81b682e
1 parent 4782a8e
commit 81b682e
Show file tree

Hide file tree

Showing 42 changed files with 84 additions and 145 deletions.
diff --git a/.server.conf b/.server.conf
@@ -14,5 +14,7 @@ http {
             port: 5432;
             dbname: VVT-i;
         }
+
+        fs_root: /;
     }
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,9 +8,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Make libraries
 add_subdirectory(project)
 
-# Make executable fs_worker_lib
+# Make executable test program
 add_subdirectory(test)
 
 # Make executable sever program
 add_executable(server.out main.cpp)
-target_link_libraries(server.out server_lib fs_worker_lib database_lib)
+target_link_libraries(server.out database_lib fs_worker_lib server_lib)
diff --git a/main.cpp b/main.cpp
@@ -5,7 +5,8 @@ int main() {
     FsWorker fs_worker;
     DataBase db_worker("postgres", "postgres", "5432", "localhost", "");
     db_worker.init();
-    Server server( fs_worker, db_worker,"settings/server.conf");
+
+    Server server( fs_worker, db_worker,"./settings/server.conf");
     if (!server.start()) {
         return -1;
     }

diff --git a/project/CMakeLists.txt b/project/CMakeLists.txt
@@ -1,11 +1,8 @@
 cmake_minimum_required(VERSION 3.6)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(DATABASE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/database_lib)
-set(FS_WORKER_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/fs_worker_lib)
-
-add_subdirectory(${DATABASE_LIB_DIR})
-add_subdirectory(${FS_WORKER_LIB_DIR})
-add_subdirectory(server)
+project(project)
 
+# Include all libraries
+add_subdirectory(database_lib)
+add_subdirectory(fs_worker_lib)
+add_subdirectory(server_lib)
diff --git a/project/database_lib/CMakeLists.txt b/project/database_lib/CMakeLists.txt
@@ -1,27 +1,21 @@
-cmake_minimum_required(VERSION 3.16.3)
+cmake_minimum_required(VERSION 3.6)
 
-find_library(PQXX_LIB pqxx)
-find_library(PQ_LIB pq)
-find_package(GTest REQUIRED)
-find_package(Threads REQUIRED)
-
-#set(CMAKE_CXX_STANDARD 14)
+project(database_lib)
 
+# Set the 20th standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lpqxx -lpq")
-set(DATABASE_LIB_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-message(${DATABASE_LIB_INCLUDES})
-#set(DATABASE_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/src/data_base.cpp
-#        ${CMAKE_CURRENT_SOURCE_DIR}/src/database_connection.cpp
-#        ${CMAKE_CURRENT_SOURCE_DIR}/src/db_not_auth_mode.cpp
-#        )
-aux_source_directory( ${CMAKE_CURRENT_SOURCE_DIR}/src/ DATABASE_LIB_SRCS)
 
-add_library(database_lib ${DATABASE_LIB_SRCS})
-target_include_directories(database_lib PUBLIC ${DATABASE_LIB_INCLUDES})
-target_link_libraries(database_lib ${PQXX_LIB} ${PQ_LIB})
+# Find libraries
+find_library(PQXX_LIB pqxx REQUIRED)
+find_library(PQ_LIB pq REQUIRED)
+find_package(GTest REQUIRED)
+find_package(Threads REQUIRED)
 
-add_executable(db_main main.cpp)
-target_include_directories( db_main PUBLIC ${DATABASE_LIB_INCLUDES})
-target_link_libraries(db_main database_lib ${PQXX_LIB} ${PQ_LIB})
+# Find all source files
+aux_source_directory(src SRC)
+
+# Create server library
+add_library(database_lib ${SRC})
+target_include_directories(database_lib PUBLIC include)
+target_link_libraries(database_lib ${PQXX_LIB} ${PQ_LIB})
diff --git a/project/database_lib/main.cpp b/project/database_lib/main.cpp
diff --git a/project/fs_worker_lib/CMakeLists.txt b/project/fs_worker_lib/CMakeLists.txt
@@ -1,17 +1,16 @@
 cmake_minimum_required(VERSION 3.6)
 
-set(FILESYSTEM_LIB_SRCS src/fs_not_auth.cpp
-        src/fs_auth_usr.cpp
-        src/fs_group.cpp
-        src/fs_worker.cpp
-        )
-set(INCLUDE_DIRS include)
+project(fs_worker_lib)
 
-set(CMAKE_CXX_FLAGS "-g -O0 -Wall  -Wextra  -Wpedantic  -pthread")
-#set(CMAKE_CXX_FLAGS "-g -O0 -Wall -Werror -Wextra -Wno-unused-variable -Wpedantic -fprofile-arcs -ftest-coverage -pthread")
+# Set the 20th standard
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Find all source files
+aux_source_directory(src SRC)
 
-add_library(fs_worker_lib STATIC ${FILESYSTEM_LIB_SRCS})
-target_include_directories(fs_worker_lib PRIVATE ${INCLUDE_DIRS})
+# Create server library
+add_library(fs_worker_lib STATIC ${SRC})
+target_include_directories(fs_worker_lib PRIVATE include)
 target_compile_definitions(fs_worker_lib PRIVATE FS_ROOT_PATH="/home/kirill/vvti_filesystem")
 target_compile_definitions(fs_worker_lib PRIVATE FS_NOT_AUTH_DIR_NAME="not_auth")
diff --git a/project/server/CMakeLists.txt b/project/server/CMakeLists.txt
diff --git a/project/server_lib/CMakeLists.txt b/project/server_lib/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(server)
+
+# Set the 20th standard
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Find libraries
+find_package(Boost REQUIRED COMPONENTS log log_setup system date_time regex)
+find_package(OpenSSL REQUIRED)
+find_package(Threads REQUIRED)
+find_package(fmt REQUIRED)
+
+# Find all source files
+aux_source_directory(config/src CONFIG_SRC)
+aux_source_directory(http/src HTTP_SRC)
+aux_source_directory(logs/src LOG_SRC)
+aux_source_directory(main/src MAIN_SRC)
+aux_source_directory(workers/src WORKERS_SRC)
+
+# Create server library
+add_library(server_lib STATIC ${CONFIG_SRC} ${HTTP_SRC} ${LOG_SRC} ${MAIN_SRC} ${WORKERS_SRC})
+target_include_directories(server_lib
+  PUBLIC config/include
+  http/include
+  logs/include
+  main/include
+  workers/include
+  ../database_lib/include
+  ../fs_worker_lib/include
+)
+target_link_libraries(
+  server_lib mailio Boost::log Boost::log_setup Boost::system Boost::date_time Boost::regex
+  OpenSSL::SSL Threads::Threads fmt::fmt
+)
diff --git a/...ver/config/include/main_server_settings.h → ...lib/config/include/main_server_settings.h b/...ver/config/include/main_server_settings.h → ...lib/config/include/main_server_settings.h
diff --git a/...t/server/config/include/server_settings.h → ...rver_lib/config/include/server_settings.h b/...t/server/config/include/server_settings.h → ...rver_lib/config/include/server_settings.h
diff --git a/...erver/config/src/main_server_settings.cpp → ...r_lib/config/src/main_server_settings.cpp b/...erver/config/src/main_server_settings.cpp → ...r_lib/config/src/main_server_settings.cpp
diff --git a/...ect/server/config/src/server_settings.cpp → ...server_lib/config/src/server_settings.cpp b/...ect/server/config/src/server_settings.cpp → ...server_lib/config/src/server_settings.cpp
diff --git a/project/server/http/include/http_base.h → project/server_lib/http/include/http_base.h b/project/server/http/include/http_base.h → project/server_lib/http/include/http_base.h
diff --git a/project/server/http/include/http_date.h → project/server_lib/http/include/http_date.h b/project/server/http/include/http_date.h → project/server_lib/http/include/http_date.h
diff --git a/project/server/http/include/http_defines.h → ...ct/server_lib/http/include/http_defines.h b/project/server/http/include/http_defines.h → ...ct/server_lib/http/include/http_defines.h
diff --git a/project/server/http/include/http_request.h → ...ct/server_lib/http/include/http_request.h b/project/server/http/include/http_request.h → ...ct/server_lib/http/include/http_request.h
diff --git a/project/server/http/include/http_response.h → ...t/server_lib/http/include/http_response.h b/project/server/http/include/http_response.h → ...t/server_lib/http/include/http_response.h
diff --git a/...ct/server/http/include/http_status_code.h → ...erver_lib/http/include/http_status_code.h b/...ct/server/http/include/http_status_code.h → ...erver_lib/http/include/http_status_code.h
diff --git a/project/server/http/src/http_base.cpp → project/server_lib/http/src/http_base.cpp b/project/server/http/src/http_base.cpp → project/server_lib/http/src/http_base.cpp
diff --git a/project/server/http/src/http_date.cpp → project/server_lib/http/src/http_date.cpp b/project/server/http/src/http_date.cpp → project/server_lib/http/src/http_date.cpp
diff --git a/project/server/http/src/http_request.cpp → project/server_lib/http/src/http_request.cpp b/project/server/http/src/http_request.cpp → project/server_lib/http/src/http_request.cpp
diff --git a/project/server/http/src/http_response.cpp → ...ect/server_lib/http/src/http_response.cpp b/project/server/http/src/http_response.cpp → ...ect/server_lib/http/src/http_response.cpp
diff --git a/project/server/http/src/http_status_code.cpp → .../server_lib/http/src/http_status_code.cpp b/project/server/http/src/http_status_code.cpp → .../server_lib/http/src/http_status_code.cpp
diff --git a/project/server/logs/include/log.h → project/server_lib/logs/include/log.h b/project/server/logs/include/log.h → project/server_lib/logs/include/log.h
diff --git a/project/server/logs/include/log_defines.h → ...ect/server_lib/logs/include/log_defines.h b/project/server/logs/include/log_defines.h → ...ect/server_lib/logs/include/log_defines.h
diff --git a/project/server/logs/src/log.cpp → project/server_lib/logs/src/log.cpp b/project/server/logs/src/log.cpp → project/server_lib/logs/src/log.cpp
diff --git a/project/server/main/include/server.h → project/server_lib/main/include/server.h b/project/server/main/include/server.h → project/server_lib/main/include/server.h
diff --git a/project/server/main/src/server.cpp → project/server_lib/main/src/server.cpp b/project/server/main/src/server.cpp → project/server_lib/main/src/server.cpp
diff --git a/...erver/workers/include/client_connection.h → ...r_lib/workers/include/client_connection.h b/...erver/workers/include/client_connection.h → ...r_lib/workers/include/client_connection.h
diff --git a/...orkers/include/request_handler_not_auth.h → ...orkers/include/request_handler_not_auth.h b/...orkers/include/request_handler_not_auth.h → ...orkers/include/request_handler_not_auth.h
diff --git a/...t/server/workers/include/worker_process.h → ...rver_lib/workers/include/worker_process.h b/...t/server/workers/include/worker_process.h → ...rver_lib/workers/include/worker_process.h
diff --git a/.../server/workers/src/client_connection.cpp → ...ver_lib/workers/src/client_connection.cpp b/.../server/workers/src/client_connection.cpp → ...ver_lib/workers/src/client_connection.cpp
diff --git a/.../workers/src/request_handler_not_auth.cpp → .../workers/src/request_handler_not_auth.cpp b/.../workers/src/request_handler_not_auth.cpp → .../workers/src/request_handler_not_auth.cpp
diff --git a/...ect/server/workers/src/worker_process.cpp → ...server_lib/workers/src/worker_process.cpp b/...ect/server/workers/src/worker_process.cpp → ...server_lib/workers/src/worker_process.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,16 +1,19 @@
 cmake_minimum_required(VERSION 3.6)
 
-project(fs_worker_lib)
+project(test)
 
-# Find package for fs_worker_lib
+# Set the 20th standard
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Find library for tests
 find_package(GTest REQUIRED)
 
-if(GTest_FOUND)
-  # Find all source files
-  aux_source_directory(server/src SERVER_SRC)
+# Find all source files
+# aux_source_directory(database_lib DATABASE_LIB_SRC)
+# aux_source_directory(fs_worker_lib FS_WORKER_LIB_SRC)
+aux_source_directory(server_lib SERVER_LIB_SRC)
 
-  add_executable(test.out main.cpp ${SERVER_SRC})
-  target_link_libraries(test.out server_lib ${GTEST_LIBRARIES} Threads::Threads)
-else()
-  message(FATAL_ERROR "GTest has not been installed!")
-endif()
+# Make executable test program
+add_executable(test.out main.cpp ${DATABASE_LIB_SRC} ${FS_WORKER_LIB_SRC} ${SERVER_LIB_SRC})
+target_link_libraries(test.out database_lib fs_worker_lib server_lib GTest::GTest Threads::Threads)
diff --git a/test/database_lib/gtest.cpp b/test/database_lib/gtest.cpp
@@ -145,9 +145,3 @@ TEST(DATA_BASE_TEST, GROUP_MODE) {
     db.group_mode.has_access_on_action(1, 1, DELETE_GROUP);
     db.group_mode.delete_group(1, 1);
 }
-
-
-int main(int argc, char **argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
diff --git a/test/fs_worker_lib/CMakeLists.txt b/test/fs_worker_lib/CMakeLists.txt
diff --git a/test/fs_worker_lib/main.cpp b/test/fs_worker_lib/main.cpp
diff --git a/test/server/src/test_http_request.cpp → test/server_lib/test_http_request.cpp b/test/server/src/test_http_request.cpp → test/server_lib/test_http_request.cpp
diff --git a/test/server/src/test_http_response.cpp → test/server_lib/test_http_response.cpp b/test/server/src/test_http_response.cpp → test/server_lib/test_http_response.cpp
@@ -4,7 +4,6 @@
 
 TEST(TEST_HTTP, HANDLE_HTTP_RESPONSE_WITH_BODY) {
     std::string result = ""
-
         "HTTP/1.1 200 OK\r\n"
         "Content-Length: 26\r\n"
         "Content-Type: text/html\r\n"

diff --git a/.../server/src/test_main_server_settings.cpp → .../server_lib/test_main_server_settings.cpp b/.../server/src/test_main_server_settings.cpp → .../server_lib/test_main_server_settings.cpp