speedup tests, fix includes

src/change_detectors/CMakeLists.txt

@@ -4,4 +4,4 @@ add_library(change_detectors srcs/ChangeDetector.cpp srcs/ChangeDetectorContaine
 
 target_include_directories(change_detectors PUBLIC includes)
 
-target_link_libraries(change_detectors utils)
+target_link_libraries(change_detectors utils repo)

src/change_detectors/includes/ComparableFile.h

@@ -9,8 +9,8 @@
 #include <functional>
 #include <streambuf>
 
-#include "../../repo/includes/Repository.h"
+#include "Repository.h"
-#include "../../repo/includes/objects/File.h"
+#include "objects/File.h"
 
 /// Helper class to allow comparing files from different sources
 /**

src/change_detectors/srcs/ChangeDetector.cpp

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

src/change_detectors/srcs/ChangeDetectorContainer.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 04.05.2023.
 //
 
-#include "../includes/ChangeDetectorContainer.h"
+#include "ChangeDetectorContainer.h"
 
 #include <functional>
 

src/change_detectors/srcs/ChangeDetectorFactory.cpp

@@ -2,15 +2,15 @@
 // Created by Stepan Usatiuk on 16.04.2023.
 //
 
-#include "../includes/ChangeDetectorFactory.h"
+#include "ChangeDetectorFactory.h"
 
 #include <vector>
 
-#include "../includes/ContentsChangeDetector.h"
+#include "ContentsChangeDetector.h"
-#include "../includes/EditTimeChangeDetector.h"
+#include "EditTimeChangeDetector.h"
-#include "../includes/SizeChangeDetector.h"
-#include "../includes/TypeChangeDetector.h"
 #include "Exception.h"
+#include "SizeChangeDetector.h"
+#include "TypeChangeDetector.h"
 
 std::unique_ptr<ChangeDetector> ChangeDetectorFactory::getChangeDetector(const std::string &type) {
     if (type == "etime") {

src/change_detectors/srcs/ComparableFile.cpp

@@ -3,13 +3,13 @@
 //
 
 
-#include "../includes/ComparableFile.h"
+#include "ComparableFile.h"
 
 #include <fstream>
 #include <sstream>
 
-#include "../../repo/includes/objects/FileBuffer.h"
+#include "Exception.h"
-#include "../../utils/includes/Exception.h"
+#include "objects/FileBuffer.h"
 
 ComparableFile::ComparableFile(const File &file, const Repository *repo)
     : path(file.name),

src/change_detectors/srcs/ContentsChangeDetector.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 05.05.2023.
 //
 
-#include "../includes/ContentsChangeDetector.h"
+#include "ContentsChangeDetector.h"
 
 #include <iterator>
 

src/change_detectors/srcs/EditTimeChangeDetector.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 16.04.2023.
 //
 
-#include "../includes/EditTimeChangeDetector.h"
+#include "EditTimeChangeDetector.h"
 
 bool EditTimeChangeDetector::check(const ComparableFile &f1, const ComparableFile &f2) const {
     return f1.mtime != f2.mtime;

src/change_detectors/srcs/SizeChangeDetector.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 16.04.2023.
 //
 
-#include "../includes/SizeChangeDetector.h"
+#include "SizeChangeDetector.h"
 
 bool SizeChangeDetector::check(const ComparableFile &f1, const ComparableFile &f2) const {
     return f1.bytes != f2.bytes;

src/change_detectors/srcs/TypeChangeDetector.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 12.05.2023.
 //
 
-#include "../includes/TypeChangeDetector.h"
+#include "TypeChangeDetector.h"
 
 bool TypeChangeDetector::check(const ComparableFile &f1, const ComparableFile &f2) const {
     return f1.type != f2.type;

src/chunkers/includes/ChunkerFactory.h

@@ -8,8 +8,8 @@
 #include <memory>
 #include <streambuf>
 
-#include "../../utils/includes/Config.h"
 #include "Chunker.h"
+#include "Config.h"
 
 /// Factory for Chunker%s
 class ChunkerFactory {

src/chunkers/srcs/Buzhash.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 26.04.2023.
 //
 
-#include "../includes/Buzhash.h"
+#include "Buzhash.h"
 
 Buzhash::Buzhash(uint32_t blockSize) : blockSize(blockSize), history() {}
 

src/chunkers/srcs/BuzhashChunker.cpp

@@ -2,10 +2,10 @@
 // Created by Stepan Usatiuk on 26.04.2023.
 //
 
-#include "../includes/BuzhashChunker.h"
+#include "BuzhashChunker.h"
 
-#include "../../crypto/includes/SHA.h"
+#include "Exception.h"
-#include "../../utils/includes/Exception.h"
+#include "SHA.h"
 
 BuzhashChunker::BuzhashChunker(std::streambuf *buf, unsigned long long minBytes, unsigned long long maxBytes, unsigned long long mask, uint32_t window) : Chunker(buf, maxBytes), window(window), minBytes(minBytes), mask(mask), buzhash(window) {}
 

src/chunkers/srcs/Chunker.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 15.04.2023.
 //
 
-#include "../includes/Chunker.h"
+#include "Chunker.h"
 
-#include "../../utils/includes/Exception.h"
+#include "Exception.h"
 
 Chunker::Chunker(std::streambuf *buf, unsigned long long maxBytes) : buf(buf), maxBytes(maxBytes) {}
 

src/chunkers/srcs/ChunkerFactory.cpp

@@ -2,11 +2,11 @@
 // Created by Stepan Usatiuk on 30.04.2023.
 //
 
-#include "../includes/ChunkerFactory.h"
+#include "ChunkerFactory.h"
 
-#include "../../utils/includes/Exception.h"
+#include "BuzhashChunker.h"
-#include "../includes/BuzhashChunker.h"
+#include "ConstChunker.h"
-#include "../includes/ConstChunker.h"
+#include "Exception.h"
 
 std::unique_ptr<Chunker> ChunkerFactory::getChunker(const Config &config, std::streambuf *buf) {
     if (config.getStr("chunker") == "const") {

src/chunkers/srcs/ConstChunker.cpp

@@ -2,10 +2,10 @@
 // Created by Stepan Usatiuk on 15.04.2023.
 //
 
-#include "../includes/ConstChunker.h"
+#include "ConstChunker.h"
 
-#include "../../crypto/includes/SHA.h"
+#include "Exception.h"
-#include "../../utils/includes/Exception.h"
+#include "SHA.h"
 
 ConstChunker::ConstChunker(std::streambuf *buf, unsigned long long maxBytes) : Chunker(buf, maxBytes) {}
 

src/commands/includes/CommandRestore.h

@@ -7,7 +7,7 @@
 
 #include "Command.h"
 
-#include "../../repo/includes/objects/File.h"
+#include "objects/File.h"
 
 #include "CommandsCommon.h"
 

src/commands/includes/Context.h

@@ -5,9 +5,9 @@
 #ifndef SEMBACKUP_CONTEXT_H
 #define SEMBACKUP_CONTEXT_H
 
-#include "../../repo/includes/Repository.h"
+#include "Config.h"
-#include "../../utils/includes/Config.h"
+#include "Logger.h"
-#include "../../utils/includes/Logger.h"
+#include "Repository.h"
 
 struct Context {
     Logger *logger;

src/commands/includes/Diff.h

@@ -8,7 +8,7 @@
 #include <sstream>
 #include <string>
 
-#include "../../change_detectors/includes/ComparableFile.h"
+#include "ComparableFile.h"
 
 /// Utility class to compute difference between two ComparableFile%s
 class Diff {

src/commands/srcs/CommandDiff.cpp

@@ -2,20 +2,20 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/CommandDiff.h"
+#include "CommandDiff.h"
 
-#include "../../change_detectors/includes/ChangeDetectorFactory.h"
+#include "BytesFormatter.h"
-#include "../../chunkers/includes/ChunkerFactory.h"
+#include "ChangeDetectorFactory.h"
-#include "../../repo/includes/Serialize.h"
+#include "ChunkerFactory.h"
-#include "../../repo/includes/objects/Archive.h"
+#include "Diff.h"
-#include "../../repo/includes/objects/Chunk.h"
+#include "Exception.h"
-#include "../../utils/includes/BytesFormatter.h"
+#include "Progress.h"
-#include "../../utils/includes/Exception.h"
+#include "RunningDiffAverage.h"
-#include "../../utils/includes/Progress.h"
+#include "Serialize.h"
-#include "../../utils/includes/RunningDiffAverage.h"
+#include "Signals.h"
-#include "../../utils/includes/Signals.h"
+#include "ThreadPool.h"
-#include "../../utils/includes/ThreadPool.h"
+#include "objects/Archive.h"
-#include "../includes/Diff.h"
+#include "objects/Chunk.h"
 
 using namespace CommandsCommon;
 

src/commands/srcs/CommandList.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/CommandList.h"
+#include "CommandList.h"
 
 CommandList::CommandList() : Command() {
 }

src/commands/srcs/CommandListFiles.cpp

@@ -2,13 +2,13 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/CommandListFiles.h"
+#include "CommandListFiles.h"
 
-#include "../../repo/includes/Serialize.h"
+#include "BytesFormatter.h"
-#include "../../repo/includes/objects/Archive.h"
+#include "Serialize.h"
-#include "../../repo/includes/objects/Chunk.h"
+#include "objects/Archive.h"
-#include "../../repo/includes/objects/File.h"
+#include "objects/Chunk.h"
-#include "../../utils/includes/BytesFormatter.h"
+#include "objects/File.h"
 
 CommandListFiles::CommandListFiles() : Command() {
 }

src/commands/srcs/CommandMount.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 07.06.2023.
 //
 
-#include "../includes/CommandMount.h"
+#include "CommandMount.h"
 #include "RepoFS.h"
 
 CommandMount::CommandMount() : Command() {

src/commands/srcs/CommandRestore.cpp

@@ -2,21 +2,21 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/CommandRestore.h"
+#include "CommandRestore.h"
 
 #include <fstream>
 #include <sstream>
 
-#include "../../chunkers/includes/ChunkerFactory.h"
+#include "BytesFormatter.h"
-#include "../../repo/includes/Serialize.h"
+#include "ChunkerFactory.h"
-#include "../../repo/includes/objects/Archive.h"
+#include "Exception.h"
-#include "../../repo/includes/objects/Chunk.h"
+#include "Progress.h"
-#include "../../utils/includes/BytesFormatter.h"
+#include "RunningDiffAverage.h"
-#include "../../utils/includes/Exception.h"
+#include "Serialize.h"
-#include "../../utils/includes/Progress.h"
+#include "Signals.h"
-#include "../../utils/includes/RunningDiffAverage.h"
+#include "ThreadPool.h"
-#include "../../utils/includes/Signals.h"
+#include "objects/Archive.h"
-#include "../../utils/includes/ThreadPool.h"
+#include "objects/Chunk.h"
 
 using namespace CommandsCommon;
 

src/commands/srcs/CommandRun.cpp

@@ -2,27 +2,27 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/CommandRun.h"
+#include "CommandRun.h"
 
 #include <fstream>
 #include <iomanip>
 #include <sstream>
 
-#include "../../change_detectors/includes/ChangeDetectorFactory.h"
+#include "BytesFormatter.h"
-#include "../../chunkers/includes/ChunkerFactory.h"
+#include "ChangeDetectorFactory.h"
-#include "../../crypto/includes/SHA.h"
+#include "ChunkerFactory.h"
-#include "../../repo/includes/Serialize.h"
+#include "Exception.h"
-#include "../../repo/includes/objects/Archive.h"
+#include "Progress.h"
-#include "../../repo/includes/objects/Chunk.h"
+#include "RunningDiffAverage.h"
-#include "../../repo/includes/objects/File.h"
+#include "SHA.h"
-#include "../../utils/includes/BytesFormatter.h"
+#include "Serialize.h"
-#include "../../utils/includes/Exception.h"
+#include "Signals.h"
-#include "../../utils/includes/Progress.h"
+#include "ThreadPool.h"
-#include "../../utils/includes/RunningDiffAverage.h"
+#include "objects/Archive.h"
-#include "../../utils/includes/Signals.h"
+#include "objects/Chunk.h"
-#include "../../utils/includes/ThreadPool.h"
+#include "objects/File.h"
 
-#include "../includes/CommandsCommon.h"
+#include "CommandsCommon.h"
 
 using namespace CommandsCommon;
 

src/commands/srcs/CommandsCommon.cpp

@@ -2,13 +2,13 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/CommandsCommon.h"
+#include "CommandsCommon.h"
 
 #include <fstream>
 #include <regex>
 
-#include "../../utils/includes/Exception.h"
+#include "Exception.h"
-#include "../../utils/includes/Signals.h"
+#include "Signals.h"
 
 void CommandsCommon::workerCallback(unsigned long long int bytesWritten, unsigned long long int bytesSkipped, unsigned long long int filesWritten, WorkerStats &to) {
     to.bytesWritten += bytesWritten;

src/commands/srcs/Diff.cpp

@@ -2,12 +2,12 @@
 // Created by Stepan Usatiuk on 06.05.2023.
 //
 
-#include "../includes/Diff.h"
+#include "Diff.h"
 
-#include "../../chunkers/includes/BuzhashChunker.h"
+#include "BuzhashChunker.h"
-#include "../../utils/includes/BytesFormatter.h"
+#include "BytesFormatter.h"
-#include "../../utils/includes/Exception.h"
+#include "Exception.h"
-#include "../../utils/includes/Signals.h"
+#include "Signals.h"
 
 bool Diff::isBinary(const ComparableFile &c) {
     auto b = c.contents();

src/crypto/srcs/AES.cpp

@@ -2,13 +2,13 @@
 // Created by Stepan Usatiuk on 30.04.2023.
 //
 
-#include "../includes/AES.h"
+#include "AES.h"
 
 #include <openssl/aes.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
-#include "../../utils/includes/Exception.h"
+#include "Exception.h"
 
 std::vector<char> AES::encrypt(const std::vector<char> &in, const std::string &password, const std::string &salt) {
     return AES::encrypt(in, AES::deriveKey(password, salt));

src/crypto/srcs/CRC32.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 12.05.2023.
 //
 
-#include "../includes/CRC32.h"
+#include "CRC32.h"
 
 CRC32::crcType CRC32::calculate(const std::vector<char> &in) {
     crcType res = crc32(0L, nullptr, 0);

src/crypto/srcs/SHA.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 15.04.2023.
 //
 
-#include "../includes/SHA.h"
+#include "SHA.h"
 
-#include "../../utils/includes/Exception.h"
+#include "Exception.h"
 
 std::string SHA::calculate(const std::vector<char> &in) {
     SHA hasher;

src/filters/includes/FilterFactory.h

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

src/filters/srcs/CheckFilter.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 12.05.2023.
 //
 
-#include "../includes/CheckFilter.h"
+#include "CheckFilter.h"
-#include "../../crypto/includes/CRC32.h"
+#include "CRC32.h"
-#include "../../repo/includes/Serialize.h"
+#include "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 "../includes/Filter.h"
+#include "Filter.h"
 Filter::~Filter() = default;

src/filters/srcs/FilterAES.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 23.04.2023.
 //
 
-#include "../includes/FilterAES.h"
+#include "FilterAES.h"
 
-#include "../../crypto/includes/AES.h"
+#include "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 "../includes/FilterContainer.h"
+#include "FilterContainer.h"
 
 FilterContainer::FilterContainer() = default;
 

src/filters/srcs/FilterFactory.cpp

@@ -2,14 +2,14 @@
 // Created by Stepan Usatiuk on 22.04.2023.
 //
 
-#include "../includes/FilterFactory.h"
+#include "FilterFactory.h"
 
-#include "../../utils/includes/Exception.h"
+#include "CheckFilter.h"
-#include "../includes/CheckFilter.h"
+#include "Exception.h"
-#include "../includes/FilterAES.h"
+#include "FilterAES.h"
-#include "../includes/FilterShift.h"
+#include "FilterShift.h"
-#include "../includes/FilterShiftSecret.h"
+#include "FilterShiftSecret.h"
-#include "../includes/FilterZlib.h"
+#include "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!");

src/filters/srcs/FilterShift.cpp

@@ -1,7 +1,7 @@
 //
 // Created by Stepan Usatiuk on 22.04.2023.
 //
-#include "../includes/FilterShift.h"
+#include "FilterShift.h"
 
 std::vector<char> FilterShift::filterWrite(std::vector<char> from) const {
     for (auto &c: from) c += shiftVal;

src/filters/srcs/FilterShiftSecret.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 23.04.2023.
 //
 
-#include "../includes/FilterShiftSecret.h"
+#include "FilterShiftSecret.h"
 
 #include <string>
 

src/filters/srcs/FilterZlib.cpp

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

src/fuse/srcs/RepoFS.cpp

@@ -3,7 +3,7 @@
 //
 
 
-#include "../includes/RepoFS.h"
+#include "RepoFS.h"
 
 #include <cerrno>
 #include <cstring>

src/main.cpp

@@ -1,24 +1,24 @@
 
 #include <iostream>
 
+#include "BytesFormatter.h"
+#include "Command.h"
+#include "CommandDiff.h"
+#include "CommandList.h"
+#include "CommandListFiles.h"
 #include "CommandMount.h"
-#include "commands/includes/Command.h"
+#include "CommandRestore.h"
-#include "commands/includes/CommandDiff.h"
+#include "CommandRun.h"
-#include "commands/includes/CommandList.h"
+#include "Config.h"
-#include "commands/includes/CommandListFiles.h"
+#include "Context.h"
-#include "commands/includes/CommandRestore.h"
+#include "Exception.h"
-#include "commands/includes/CommandRun.h"
+#include "FileRepository.h"
-#include "commands/includes/Context.h"
+#include "Logger.h"
-#include "repo/includes/FileRepository.h"
+#include "Repository.h"
-#include "repo/includes/Repository.h"
+#include "Serialize.h"
-#include "repo/includes/Serialize.h"
+#include "Signals.h"
-#include "repo/includes/objects/Archive.h"
+#include "objects/Archive.h"
-#include "repo/includes/objects/File.h"
+#include "objects/File.h"
-#include "utils/includes/BytesFormatter.h"
-#include "utils/includes/Config.h"
-#include "utils/includes/Exception.h"
-#include "utils/includes/Logger.h"
-#include "utils/includes/Signals.h"
 
 Config getConf(int argc, char *argv[]) {
     Config out;

src/repo/includes/Repository.h

@@ -9,8 +9,8 @@
 #include <mutex>
 #include <set>
 
-#include "../../filters/includes/FilterContainer.h"
+#include "Config.h"
-#include "../../utils/includes/Config.h"
+#include "FilterContainer.h"
 #include "Object.h"
 
 /// Abstract base class for an Object Repository

src/repo/srcs/FileRepository.cpp

@@ -2,16 +2,16 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../includes/FileRepository.h"
+#include "FileRepository.h"
 
 #include <exception>
 #include <iterator>
 #include <mutex>
 
-#include "../../filters/includes/CheckFilter.h"
+#include "CheckFilter.h"
-#include "../../filters/includes/FilterFactory.h"
+#include "FilterFactory.h"
-#include "../includes/Object.h"
+#include "Object.h"
-#include "../includes/Serialize.h"
+#include "Serialize.h"
 
 FileRepository::FileRepository(Config config) : Repository(std::move(config)), root(std::filesystem::path(this->config.getStr("repo"))), writeCacheMax(config.getInt("repo-target") * 1024 * 1024) {}
 

src/repo/srcs/Object.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../includes/Object.h"
+#include "Object.h"
 
-#include "../includes/Serialize.h"
+#include "Serialize.h"
 
 Object::Object(idType id, ObjectType type) : id(id), type(type) {}
 

src/repo/srcs/Repository.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../includes/Repository.h"
+#include "Repository.h"
 Repository::~Repository() = default;
 
 Repository::Repository(Config config) : config(std::move(config)) {}

src/repo/srcs/objects/Archive.cpp

@@ -2,10 +2,10 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../../includes/objects/Archive.h"
+#include "objects/Archive.h"
 
-#include "../../../utils/includes/Exception.h"
+#include "Exception.h"
-#include "../../includes/Serialize.h"
+#include "Serialize.h"
 
 Archive::Archive(Object::idType id, std::string name, unsigned long long mtime, std::vector<idType> files)
     : Object(id, ObjectType::Archive), name(name), mtime(mtime), files(files) {}

src/repo/srcs/objects/Chunk.cpp

@@ -2,10 +2,10 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../../includes/objects/Chunk.h"
+#include "objects/Chunk.h"
 
-#include "../../../utils/includes/Exception.h"
+#include "Exception.h"
-#include "../../includes/Serialize.h"
+#include "Serialize.h"
 
 Chunk::Chunk(idType id, std::string SHA, std::vector<char> data) : Object(id, ObjectType::Chunk), data(std::move(data)), SHA(std::move(SHA)), length(this->data.size()) {}
 

src/repo/srcs/objects/File.cpp

@@ -2,14 +2,14 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../../includes/objects/File.h"
+#include "objects/File.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../../../utils/includes/Exception.h"
+#include "Exception.h"
-#include "../../includes/Serialize.h"
+#include "Serialize.h"
 
 File::File(Object::idType id, std::string name, unsigned long long bytes, unsigned long long mtime, std::string SHA, std::map<size_t, idType> chunks, Type fileType)
     : Object(id, ObjectType::File), name(name), bytes(bytes), mtime(mtime), SHA(SHA), fileType(fileType), chunks(std::move(chunks)) {}

src/repo/srcs/objects/FileBuffer.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 23.04.2023.
 //
 
-#include "../../includes/objects/FileBuffer.h"
+#include "objects/FileBuffer.h"
 
-#include "../../includes/Serialize.h"
+#include "Serialize.h"
 
 FileBuffer::FileBuffer(const Repository *repo, Object::idType fileId) : repo(repo), file(Serialize::deserialize<File>(repo->getObject(fileId))), chunksQueue() {
     for (auto const &id: file.chunks) chunksQueue.emplace(id.second);

src/utils/includes/Serialize.h

@@ -20,7 +20,7 @@
 #include <endian.h>
 #endif
 
-#include "../../utils/includes/Exception.h"
+#include "Exception.h"
 
 /// Serialization library
 /**

src/utils/srcs/BytesFormatter.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 13.05.2023.
 //
 
-#include "../includes/BytesFormatter.h"
+#include "BytesFormatter.h"
 
 #include <iomanip>
 #include <sstream>

src/utils/srcs/Config.cpp

@@ -2,9 +2,9 @@
 // Created by Stepan Usatiuk on 01.05.2023.
 //
 
-#include "../includes/Config.h"
+#include "Config.h"
-#include "../../repo/includes/Serialize.h"
+#include "Exception.h"
-#include "../includes/Exception.h"
+#include "Serialize.h"
 #include <sstream>
 
 Config &Config::add(const std::string &k, const std::string &v) {

src/utils/srcs/Exception.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 01.05.2023.
 //
 
-#include "../includes/Exception.h"
+#include "Exception.h"
 #include <execinfo.h>
 #include <sstream>
 

src/utils/srcs/Logger.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 23.05.2023.
 //
 
-#include "../includes/Logger.h"
+#include "Logger.h"
 
 Logger::Logger(int level, std::ostream &out) : loglevel(level), out(out) {
 }

src/utils/srcs/Progress.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 05.05.2023.
 //
 
-#include "../includes/Progress.h"
+#include "Progress.h"
 
 #include <sstream>
 #include <utility>

src/utils/srcs/RunningAverage.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 05.05.2023.
 //
 
-#include "../includes/RunningAverage.h"
+#include "RunningAverage.h"
 
 RunningAverage::RunningAverage(std::function<unsigned long long int()> getFunc, int max, int ms)
     : getFunc(std::move(getFunc)), max(max), ms(ms), thread(&RunningAverage::loop, this) {

src/utils/srcs/RunningDiffAverage.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 12.05.2023.
 //
 
-#include "../includes/RunningDiffAverage.h"
+#include "RunningDiffAverage.h"
 
 RunningDiffAverage::RunningDiffAverage(std::function<unsigned long long int()> getFunc, int max, int ms)
     : runningAverage(

src/utils/srcs/Signals.cpp

@@ -1,7 +1,7 @@
 //
 // Created by Stepan Usatiuk on 16.04.2023.
 //
-#include "../includes/Signals.h"
+#include "Signals.h"
 
 void Signals::setup() {
     signal(SIGINT, handle);

src/utils/srcs/ThreadPool.cpp

@@ -1,7 +1,7 @@
 #include <string>
 
-#include "../includes/Signals.h"
+#include "Signals.h"
-#include "../includes/ThreadPool.h"
+#include "ThreadPool.h"
 
 ThreadPool::ThreadPool(std::function<void(std::string)> onError, std::size_t workersNum) : onError(std::move(onError)) {
     for (int i = 0; i < workersNum; i++) threads.emplace_back(&ThreadPool::loop, this);

tests/clitests/scripts/backup.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 
-TESTSIZE=16
+TESTSIZE=4
 
 # TODO: Don't hardcode this
 CMD="../../src/backup"
 
+CHUNKEROPTS=" --chunker-min 64 --chunker-max 1024 --chunker-mask 17 --repo-target 2 "
+
 TESTDATADIR=backup
 
 rm -rf "$TESTDATADIR"
@@ -50,7 +52,7 @@ cat "$TESTDATADIR"/testdata/7/b >> "$TESTDATADIR"/testdata/8/b
 
 echo "Data created"
 
-if ! $CMD init --repo "$TESTDATADIR"/testdir/to1 --compression zlib --compression-level 4 --encryption aes --password asdff --salt e; then
+if ! $CMD init $CHUNKEROPTS --repo "$TESTDATADIR"/testdir/to1 --compression zlib --compression-level 4 --encryption aes --password asdff --salt e; then
   echo "Error creating repo!"
   exit 1
 fi
@@ -204,101 +206,6 @@ if ! ( ! ( echo "$OUT" | grep -q 'b is different' ) && ( echo "$OUT" | grep -q '
 fi
 echo "OK comparing archive last and current"
 
-
-if ! $CMD init --repo "$TESTDATADIR"/testdir/to2 --compression zlib --compression-level 4 --encryption aes --password asdff --salt e; then
-  echo "Error creating repo!"
-  exit 1
-fi
-echo "Repo created"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! ( ( echo "$OUT" | grep -q 'Copied: a' ) && ( echo "$OUT" | grep -q 'Copied: aa' ) && ( echo "$OUT" | grep -q 'Copied: b' ) &&  ( echo "$OUT" | grep -q 'Copied: c' ) ); then
-  echo "Error backing up 1 dir!"
-  exit 1
-fi
-echo "Backup 1 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' )); then
-  echo "Error backing up 2 dir!"
-  exit 1
-fi
-echo "Backup 2 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 3 dir!"
-  exit 1
-fi
-echo "Backup 3 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' )); then
-  echo "Error backing up 4 dir!"
-  exit 1
-fi
-echo "Backup 4 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 5 dir!"
-  exit 1
-fi
-echo "Backup 5 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 6 dir!"
-  exit 1
-fi
-echo "Backup 6 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 7 dir!"
-  exit 1
-fi
-echo "Backup 7 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' )); then
-  echo "Error backing up 8 dir!"
-  exit 1
-fi
-echo "Backup 8 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 9 dir!"
-  exit 1
-fi
-echo "Backup 9 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! (  ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 10 dir!"
-  exit 1
-fi
-echo "Backup 10 ok"
-
-OUT=$($CMD run --from "$TESTDATADIR"/testdata/1 --repo "$TESTDATADIR"/testdir/to2 --password asdff --progress simple --verbose 1)
-echo "$OUT"
-if ! ( ( echo "$OUT" | grep -q 'Skipped: a' ) && ( echo "$OUT" | grep -q 'Skipped: aa' ) && ( echo "$OUT" | grep -q 'Skipped: b' ) &&  ( echo "$OUT" | grep -q 'Skipped: c' ) ); then
-  echo "Error backing up 11 dir!"
-  exit 1
-fi
-echo "Backup 11 ok"
-
 rm -rf "$TESTDATADIR"
 
 exit 0

tests/utils/srcs/Cleaner.cpp

@@ -2,7 +2,7 @@
 // Created by Stepan Usatiuk on 14.04.2023.
 //
 
-#include "../includes/Cleaner.h"
+#include "Cleaner.h"
 
 Cleaner::Cleaner(std::vector<std::filesystem::path> toClean) : toClean(std::move(toClean)) {
     for (const auto &p: this->toClean) {