diff --git a/ChunkManager.cpp b/ChunkManager.cpp index e6b28ab..e443766 100644 --- a/ChunkManager.cpp +++ b/ChunkManager.cpp @@ -65,7 +65,7 @@ std::vector ChunkManager::chunked(const std::vector& raw, const bool // Kompresja std::vector ChunkManager::compress_data(const std::vector& input) { - const int level = 3; + const int level = COMPRESSION_LEVEL; // Obs³uga pustego chunku: zwracamy pusty wynik (0 bajtów). if (input.empty()) return {}; diff --git a/ChunkManager.h b/ChunkManager.h index 03cafa5..3a2b83c 100644 --- a/ChunkManager.h +++ b/ChunkManager.h @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -17,6 +16,7 @@ #include "EncryptionManager.h" #define BLOCK_SIZE 131072 // 128KB +#define COMPRESSION_LEVEL 3 struct BlockSize { diff --git a/ExtractCargo.cpp b/ExtractCargo.cpp index 5237e44..13bde7f 100644 --- a/ExtractCargo.cpp +++ b/ExtractCargo.cpp @@ -139,12 +139,12 @@ bool ExtractCargo::HashValid(const std::vector& data, const uint64_t& crc) //----------------------------------------------------------------------------- void ExtractCargo::computingBytes(const std::vector& input, std::vector& output, const int16_t& flag) { - CompressingManager cm(eman); + ChunkManager cm(eman); switch (flag) { case 1: - output = cm.decompress(input, false); + output = cm.dechunked(input, false); break; case 2: @@ -152,7 +152,7 @@ void ExtractCargo::computingBytes(const std::vector& input, std::vector_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - 3rd\ftxui\include;3rd\libsodium\include;3rd\json\include;3rd\zstd\include;3rd\lz4\include;3rd\xxhash\include + 3rd\ftxui\include;3rd\libsodium\include;3rd\json\include;3rd\zstd\include;3rd\xxhash\include;3rd\xxhash\include Console true - 3rd\zstd\lib\Debug;3rd\ftxui\Debug;3rd\lz4\lib;3rd\libsodium\lib\Debug - liblz4_static.lib;ftxui-component.lib;ftxui-dom.lib;ftxui-screen.lib;libsodium.lib;zstd_static.lib + 3rd\zstd\lib\Debug;3rd\ftxui\Debug;3rd\xxhash\lib\Debug;3rd\libsodium\lib\Debug + ftxui-component.lib;ftxui-dom.lib;ftxui-screen.lib;libsodium.lib;zstd_static.lib;xxhash.lib @@ -122,13 +122,13 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - 3rd\ftxui\include;3rd\libsodium\include;3rd\json\include;3rd\zstd\include;3rd\lz4\include; + 3rd\ftxui\include;3rd\libsodium\include;3rd\json\include;3rd\zstd\include;3rd\xxhash\include; Console true - 3rd\zstd\lib\Release;3rd\libsodium\lib\Release;3rd\ftxui\Release;3rd\lz4\lib - liblz4_static.lib;ftxui-component.lib;ftxui-dom.lib;ftxui-screen.lib;libsodium.lib;zstd_static.lib + 3rd\zstd\lib\Release;3rd\libsodium\lib\Release;3rd\xxhash\lib\Release;3rd\ftxui\Release + ftxui-component.lib;ftxui-dom.lib;ftxui-screen.lib;libsodium.lib;zstd_static.lib;xxhash.lib diff --git a/xxhash.dll b/xxhash.dll new file mode 100644 index 0000000..4ee9ba0 Binary files /dev/null and b/xxhash.dll differ