PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

enable deflate compression in io::write_zip

Browse Source
This commit is contained in:
MihailRis 2025-02-25 22:49:31 +03:00
parent 226ee40b5a
commit bd614c5f2e
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/io/devices/ZipFileDevice.cpp
View File

@ -4,7 +4,9 @@
#include "debug/Logger.hpp" #include "debug/Logger.hpp"
#include "io/memory_istream.hpp" #include "io/memory_istream.hpp"
#include "io/memory_ostream.hpp"
#include "io/deflate_istream.hpp" #include "io/deflate_istream.hpp"
#include "io/deflate_ostream.hpp"
#include "util/data_io.hpp" #include "util/data_io.hpp"
#include "util/Buffer.hpp" #include "util/Buffer.hpp"
@ -316,6 +318,7 @@ static void write_headers(
size_t srcSize, size_t srcSize,
size_t compressedSize, size_t compressedSize,
uint32_t crc, uint32_t crc,
int compressionMethod,
const file_time_type& modificationTime, const file_time_type& modificationTime,
ByteBuilder& centralDir ByteBuilder& centralDir
) { ) {
@ -324,7 +327,7 @@ static void write_headers(
header.putInt32(LOCAL_FILE_SIGNATURE); header.putInt32(LOCAL_FILE_SIGNATURE);
header.putInt16(10); // version header.putInt16(10); // version
header.putInt16(0); // flags header.putInt16(0); // flags
header.putInt16(0); // compression method header.putInt16(compressionMethod); // compression method
header.putInt32(timestamp); // last modification datetime header.putInt32(timestamp); // last modification datetime
header.putInt32(crc); // crc32 header.putInt32(crc); // crc32
header.putInt32(compressedSize); header.putInt32(compressedSize);
@ -340,7 +343,7 @@ static void write_headers(
centralDir.putInt16(10); // version centralDir.putInt16(10); // version
centralDir.putInt16(0); // version centralDir.putInt16(0); // version
centralDir.putInt16(0); // flags centralDir.putInt16(0); // flags
centralDir.putInt16(0); // compression method centralDir.putInt16(compressionMethod); // compression method
centralDir.putInt32(timestamp); // last modification datetime centralDir.putInt32(timestamp); // last modification datetime
centralDir.putInt32(crc); // crc32 centralDir.putInt32(crc); // crc32
centralDir.putInt32(compressedSize); centralDir.putInt32(compressedSize);
@ -368,21 +371,42 @@ static size_t write_zip(
auto modificationTime = io::last_write_time(entry); auto modificationTime = io::last_write_time(entry);
if (io::is_directory(entry)) { if (io::is_directory(entry)) {
name = name + "/"; name = name + "/";
write_headers(file, name, 0, 0, 0, modificationTime, centralDir);
entries += write_zip(root, entry, file, centralDir) + 1;
} else {
auto data = io::read_bytes_buffer(entry);
uint32_t crc = crc32(0, data.data(), data.size());
write_headers( write_headers(
file, file,
name, name,
data.size(), 0,
data.size(), 0,
crc, 0,
COMPRESSION_NONE,
modificationTime, modificationTime,
centralDir centralDir
); );
file.write(reinterpret_cast<const char*>(data.data()), data.size()); entries += write_zip(root, entry, file, centralDir) + 1;
} else {
auto uncompressed = io::read_bytes_buffer(entry);
uint32_t crc = crc32(0, uncompressed.data(), uncompressed.size());
memory_ostream memoryStream;
{
deflate_ostream deflateStream(memoryStream);
deflateStream.write(
reinterpret_cast<char*>(uncompressed.data()),
uncompressed.size()
);
deflateStream.flush();
}
auto data = memoryStream.release();
size_t dataSize = data.size();
write_headers(
file,
name,
uncompressed.size(),
dataSize,
crc,
COMPRESSION_DEFLATE,
modificationTime,
centralDir
);
file.write(reinterpret_cast<const char*>(data.data()), dataSize);
entries++; entries++;
} }
} }