lib/zlibutil, tools/zlibutil: moving things around
This includes the following changes: - Move the data type wrangling into the lib to make it easier to use - Put the functions into their own `zlib` namespace - Use ErrorOr instead of exceptions - Error codes for compression/decompressionjocadbz
parent
ef0a2707dd
commit
61cec73c49
|
@ -28,6 +28,7 @@
|
||||||
#include "../lib/cli.hpp"
|
#include "../lib/cli.hpp"
|
||||||
#include "../lib/file.hpp"
|
#include "../lib/file.hpp"
|
||||||
#include "../lib/zlibutil.hpp"
|
#include "../lib/zlibutil.hpp"
|
||||||
|
#include "../lib/error.hpp"
|
||||||
|
|
||||||
#define EXIT_SUCCESS 0
|
#define EXIT_SUCCESS 0
|
||||||
#define EXIT_RUNTIME 1
|
#define EXIT_RUNTIME 1
|
||||||
|
@ -112,14 +113,18 @@ int main(int argc, char* argv[]) {
|
||||||
return EXIT_RUNTIME;
|
return EXIT_RUNTIME;
|
||||||
}
|
}
|
||||||
File* file = filePointer.value;
|
File* file = filePointer.value;
|
||||||
File *writeFile;
|
File* writeFile;
|
||||||
|
|
||||||
if (cliParser.getFlag("decompress").value) {
|
if (cliParser.getFlag("decompress").value) {
|
||||||
std::vector<uint8_t> bytes = file->read(file->size.value).value; // this is what you get from lib/file IIRC
|
std::vector<uint8_t> bytes = file->read(file->size.value).value;
|
||||||
std::vector<char> differentBytes = std::vector<char>(bytes.begin(), bytes.end());
|
|
||||||
|
|
||||||
std::vector<char> compressed = decompressData(differentBytes.data(), file->size.value);
|
ErrorOr<std::vector<uint8_t>> decompressed = zlib::decompressData(bytes);
|
||||||
std::vector<unsigned char> unsigneddata = std::vector<unsigned char>(compressed.begin(), compressed.end());
|
if (decompressed.isError) {
|
||||||
|
std::cout << "Error: Failed to decompress: " << filename << std::endl;
|
||||||
|
delete file;
|
||||||
|
// not cleaning up writeFile here bc it hasn't been created
|
||||||
|
return EXIT_RUNTIME;
|
||||||
|
}
|
||||||
|
|
||||||
std::string outFilename;
|
std::string outFilename;
|
||||||
if (filename.length() > 3 && filename.rfind(".zz") == filename.length()-3) {
|
if (filename.length() > 3 && filename.rfind(".zz") == filename.length()-3) {
|
||||||
|
@ -128,16 +133,23 @@ int main(int argc, char* argv[]) {
|
||||||
outFilename = filename + ".uncompressed";
|
outFilename = filename + ".uncompressed";
|
||||||
}
|
}
|
||||||
writeFile = File::open(outFilename, 'w').value;
|
writeFile = File::open(outFilename, 'w').value;
|
||||||
writeFile->write(unsigneddata);
|
writeFile->write(decompressed.value);
|
||||||
writeFile->close();
|
writeFile->close();
|
||||||
} else {
|
} else {
|
||||||
std::vector<uint8_t> bytes = file->read(file->size.value).value; // this is what you get from lib/file IIRC
|
std::vector<uint8_t> bytes = file->read(file->size.value).value;
|
||||||
std::vector<char> differentBytes = std::vector<char>(bytes.begin(), bytes.end());
|
|
||||||
|
|
||||||
std::vector<char> compressed = compressData(differentBytes.data(), file->size.value);
|
ErrorOr<std::vector<uint8_t>> compressed = zlib::compressData(bytes);
|
||||||
std::vector<unsigned char> unsigneddata = std::vector<unsigned char>(compressed.begin(), compressed.end());
|
if (compressed.isError) {
|
||||||
|
std::cout << "Error: Failed to compress: " << filename << std::endl;
|
||||||
|
delete file;
|
||||||
|
// not cleaning up writeFile here bc it hasn't been created
|
||||||
|
return EXIT_RUNTIME;
|
||||||
|
}
|
||||||
writeFile = File::open(filename + ".zz", 'w').value;
|
writeFile = File::open(filename + ".zz", 'w').value;
|
||||||
writeFile->write(unsigneddata);
|
writeFile->write(compressed.value);
|
||||||
writeFile->close();
|
writeFile->close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delete file;
|
||||||
|
delete writeFile;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue