proper cmake

src/filters/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.22)
+
+
+find_package(ZLIB REQUIRED)
+
+add_library(filters srcs/CheckFilter.cpp srcs/Filter.cpp srcs/FilterAES.cpp srcs/FilterContainer.cpp srcs/FilterShift.cpp srcs/FilterShiftSecret.cpp srcs/FilterZlib.cpp srcs/FilterFactory.cpp)
+
+target_include_directories(filters PUBLIC includes)
+
+target_link_libraries(filters ZLIB::ZLIB utils)

src/filters/includes/FilterFactory.h

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include "../Config.h"
+#include "../../utils/includes/Config.h"
 #include "Filter.h"
 
 /// Utility factory class for Filter%s

src/filters/includes/FilterShift.h

@@ -1,7 +1,6 @@
 //
 // Created by Stepan Usatiuk on 22.04.2023.
 //
-#ifdef TEST
 #ifndef SEMBACKUP_FILTERSHIFT_H
 #define SEMBACKUP_FILTERSHIFT_H
 
@@ -27,4 +26,3 @@ private:
 
 
 #endif//SEMBACKUP_FILTERSHIFT_H
-#endif//TEST

src/filters/includes/FilterShiftSecret.h

@@ -1,13 +1,11 @@
 //
 // Created by Stepan Usatiuk on 23.04.2023.
 //
-#ifdef TEST
 #ifndef SEMBACKUP_FILTERSHIFTSECRET_H
 #define SEMBACKUP_FILTERSHIFTSECRET_H
 
-#include <string>
-
 #include "Filter.h"
+#include <string>
 
 /// Filter implementation that shifts every byte in input vector using two provided value
 /// \warning For testing purposes only!
@@ -30,4 +28,3 @@ private:
 
 
 #endif//SEMBACKUP_FILTERSHIFTSECRET_H
-#endif//TEST

src/filters/srcs/CheckFilter.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 12.05.2023.
 //
 
-#include "CheckFilter.h"
-#include "../crypto/CRC32.h"
-#include "../repo/Serialize.h"
+#include "../includes/CheckFilter.h"
+#include "../../crypto/includes/CRC32.h"
+#include "../../repo/includes/Serialize.h"
 
 std::vector<char> CheckFilter::filterWrite(std::vector<char> from) const {
     return filterWriteStatic(std::move(from));

src/filters/srcs/Filter.cpp

@@ -2,5 +2,5 @@
 // Created by Stepan Usatiuk on 22.04.2023.
 //
 
-#include "Filter.h"
+#include "../includes/Filter.h"
 Filter::~Filter() = default;

src/filters/srcs/FilterAES.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 23.04.2023.
 //
 
-#include "FilterAES.h"
+#include "../includes/FilterAES.h"
 
-#include "../crypto/AES.h"
+#include "../../crypto/includes/AES.h"
 
 std::vector<char> FilterAES::filterWrite(std::vector<char> from) const {
     return AES::encrypt(from, key);

src/filters/srcs/FilterContainer.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 22.04.2023.
 //
 
-#include "FilterContainer.h"
+#include "../includes/FilterContainer.h"
 
 FilterContainer::FilterContainer() = default;
 

src/filters/srcs/FilterFactory.cpp

@@ -2,14 +2,14 @@
 // Created by Stepan Usatiuk on 22.04.2023.
 //
 
-#include "FilterFactory.h"
+#include "../includes/FilterFactory.h"
 
-#include "../Exception.h"
-#include "CheckFilter.h"
-#include "FilterAES.h"
-#include "FilterShift.h"
-#include "FilterShiftSecret.h"
-#include "FilterZlib.h"
+#include "../../utils/includes/Exception.h"
+#include "../includes/CheckFilter.h"
+#include "../includes/FilterAES.h"
+#include "../includes/FilterShift.h"
+#include "../includes/FilterShiftSecret.h"
+#include "../includes/FilterZlib.h"
 
 std::unique_ptr<Filter> FilterFactory::makeFilter(const std::string &type, const Config &config) {
     if (type == "none") throw Exception("Trying to make a \"none\" filter!");
@@ -20,13 +20,10 @@ std::unique_ptr<Filter> FilterFactory::makeFilter(const std::string &type, const
         return std::make_unique<FilterZlib>(config.getInt("compression-level"));
     } else if (type == "crc") {
         return std::make_unique<CheckFilter>();
-    }
-#ifdef TEST
-    else if (type == "shiftC") {
+    } else if (type == "shiftC") {
         return std::make_unique<FilterShift>(config.getInt("compression-level"));
     } else if (type == "shiftE")
         return std::make_unique<FilterShiftSecret>(config.getStr("password"), config.getStr("salt"));
-#endif
 
     throw Exception("Unknown filter value");
 }

src/filters/srcs/FilterShift.cpp

@@ -1,8 +1,7 @@
 //
 // Created by Stepan Usatiuk on 22.04.2023.
 //
-#ifdef TEST
-#include "FilterShift.h"
+#include "../includes/FilterShift.h"
 
 std::vector<char> FilterShift::filterWrite(std::vector<char> from) const {
     for (auto &c: from) c += shiftVal;
@@ -15,4 +14,3 @@ std::vector<char> FilterShift::filterRead(std::vector<char> from) const {
 }
 
 FilterShift::FilterShift(int level) : shiftVal(level) {}
-#endif

src/filters/srcs/FilterShiftSecret.cpp

@@ -1,9 +1,8 @@
 //
 // Created by Stepan Usatiuk on 23.04.2023.
 //
-#ifdef TEST
 
-#include "FilterShiftSecret.h"
+#include "../includes/FilterShiftSecret.h"
 
 #include <string>
 
@@ -20,4 +19,3 @@ std::vector<char> FilterShiftSecret::filterRead(std::vector<char> from) const {
 FilterShiftSecret::FilterShiftSecret(const std::string &password, const std::string &salt) {
     shiftVal = password[0] + salt[0];
 }
-#endif

src/filters/srcs/FilterZlib.cpp

@@ -2,11 +2,11 @@
 // Created by Stepan Usatiuk on 23.04.2023.
 //
 
-#include "FilterZlib.h"
+#include "../includes/FilterZlib.h"
 
 #include <zlib.h>
 
-#include "../repo/Serialize.h"
+#include "../../repo/includes/Serialize.h"
 
 std::vector<char> FilterZlib::filterWrite(std::vector<char> from) const {
     uLongf outSize = compressBound(from.size());