tools/zlibutil: Chnage CLI to act more like other compression utilities

Compression is now the implied default action, decompress with the -d flag.
resources/region_files: add a zlib compressed chunk
2024-03-24 19:48:15 +01:00 · 2024-03-24 18:58:26 +01:00 · 2024-03-24 18:11:28 +01:00 · 2024-03-24 14:53:57 +01:00 · 2024-03-24 13:27:56 +01:00 · 2024-03-24 13:27:56 +01:00
6 changed files with 77 additions and 178 deletions
--- a/resources/region_files/first_chunk.sh
+++ b/resources/region_files/first_chunk.sh
--- a/scripts/build.sh
+++ b/scripts/build.sh
@ -35,20 +35,10 @@ fi
 # dynamically linked libraries.
 echo ">>> Building libs..."
 create_directory bin/lib
-COMPILE_COMMANDS=(
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/net/client.so ./src/lib/net/client.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/net/server.so ./src/lib/net/server.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/cli.so ./src/lib/cli.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/file.so ./src/lib/file.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/game/block.so ./src/lib/game/block.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/game/entity.so ./src/lib/game/entity.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/nbt.so ./src/lib/nbt.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -o ./bin/lib/region.so ./src/lib/region.cpp"
-    "$CXX_WITH_FLAGS -I ./include -fPIC -shared -l:libz.so -o ./bin/lib/zlibutil.so ./src/lib/zlibutil.cpp"
-)
-for command in ${!COMPILE_COMMANDS[@]}; do
-    echo "${COMPILE_COMMANDS[command]}"
-    ${COMPILE_COMMANDS[command]} &
+for lib in $(find ./src/lib -name "*.cpp"); do
+    COMPILE_COMMAND="$CXX_WITH_FLAGS -I ./include -fPIC -shared -o $(sed -e 's/^.\/src/.\/bin/;s/cpp$/so/' <<< $lib) $lib"
+    echo $COMPILE_COMMAND
+    $COMPILE_COMMAND &
    $WAIT_ANYWAY
 done

@ -72,7 +62,7 @@ COMPILE_COMMANDS=(
    "$CXX_WITH_FLAGS src/tools/dumpnbt.cpp -I./include -Lbin/lib -l:nbt.so -l:cli.so -o bin/tools/dumpnbt"
    "$CXX_WITH_FLAGS src/tools/arraydump.cpp -I./include -Lbin/lib -l:file.so -l:cli.so -o bin/tools/arraydump"
    "$CXX_WITH_FLAGS src/tools/baseconvert.cpp -I./include -Lbin/lib -l:cli.so -o bin/tools/baseconvert"
-    "$CXX_WITH_FLAGS src/tools/zlibutil.cpp -I./include -Lbin/lib -l:cli.so -l:file.so -l:zlibutil.so -l:libz.so -o bin/tools/zlibutil"
+    "$CXX_WITH_FLAGS src/tools/zlibutil.cpp -I./include -Lbin/lib -l:cli.so -l:libz.so -l:file.so -o bin/tools/zlibutil"
    "$CXX_WITH_FLAGS -pthread src/tools/hexnet.cpp -I./include -Lbin/lib -l:cli.so -l:libsockpp.so -o bin/tools/hexnet"
    "$CXX_WITH_FLAGS -DFOSSVG_DEBUG src/fossvg.cpp -I./include -Lbin/lib -l:file.so -l:cli.so -lglfw -lvulkan -o bin/fossvg"
    "$CXX_WITH_FLAGS src/fossvgd.cpp -I./include -Lbin/lib -l:cli.so -o bin/fossvgd"
--- a/scripts/test/zlibutil.sh
+++ b/scripts/test/zlibutil.sh
@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-echo "================================================================================"
-echo -n "Testing \`zlibutil\`... "
-
-
-echo "abc" >> testfile
-
-bin/tools/zlibutil -c testfile
-
-if [ "$(bin/tools/arraydump --binary testfile.compressed)" = "{0b01111000, 0b10011100, 0b01001011, 0b01001100, 0b01001010, 0b11100110, 0b00000010, 0b00000000, 0b00000011, 0b01111110, 0b00000001, 0b00110001}" ]; then
-    echo -n "Compression Test: PASS... "
-else
-    echo -n "Compression Test: FAILED... "
-fi
-
-bin/tools/zlibutil -d testfile.compressed
-
-if [ "$(bin/tools/arraydump --binary testfile.compressed.uncompressed)" = "{0b01100001, 0b01100010, 0b01100011, 0b00001010}" ]; then
-    echo "Decompression Test: PASS"
-else
-    echo "Decompression Test: FAILED"
-fi
-
-rm testfile testfile.compressed testfile.compressed.uncompressed
-
-echo "================================================================================"
--- a/src/lib/zlibutil.cpp
+++ b/src/lib/zlibutil.cpp
@ -1,107 +0,0 @@
-// Copyright 2022, FOSS-VG Developers and Contributers
-//
-// Author(s):
-//  Jocadbz
-//
-// This program is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// version 3 along with this program.
-// If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
-
-#include "../lib/zlibutil.hpp" 
-
-#include <bitset>
-#include <iomanip>
-#include <iostream>
-#include <vector>
-#include <tinyutf8/tinyutf8.h>
-#include <zlib/zlib.h>
-#include <cstring>
-
-#include "../lib/cli.hpp"
-#include "../lib/file.hpp"
-
-#define EXIT_SUCCESS 0
-#define EXIT_RUNTIME 1
-#define EXIT_USAGE   2
-
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <zlib.h>
-
-#define CHUNK_SIZE 16384 // Chunk size
-
-
-std::vector<char> compressData(const char* data, int size) {
-    z_stream zs;
-    memset(&zs, 0, sizeof(zs));
-
-    if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) != Z_OK)
-        throw(std::runtime_error("deflateInit failed while compressing."));
-
-    zs.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(data));
-    zs.avail_in = size;
-
-    int ret;
-    char outbuffer[CHUNK_SIZE];
-    std::vector<char> compressedData;
-
-    do {
-        zs.next_out = reinterpret_cast<Bytef*>(outbuffer);
-        zs.avail_out = CHUNK_SIZE;
-
-        ret = deflate(&zs, Z_FINISH);
-
-        if (compressedData.size() < zs.total_out)
-            compressedData.insert(compressedData.end(), outbuffer, outbuffer + CHUNK_SIZE - zs.avail_out);
-    } while (ret == Z_OK);
-
-    deflateEnd(&zs);
-
-    if (ret != Z_STREAM_END)
-        throw(std::runtime_error("Error while compressing: " + std::to_string(ret)));
-
-    return compressedData;
-}
-
-
-std::vector<char> decompressData(const char* data, int size) {
-    z_stream zs;
-    memset(&zs, 0, sizeof(zs));
-
-    if (inflateInit(&zs) != Z_OK)
-        throw(std::runtime_error("inflateInit failed while decompressing."));
-
-    zs.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(data));
-    zs.avail_in = size;
-
-    int ret;
-    char outbuffer[CHUNK_SIZE];
-    std::vector<char> decompressedData;
-
-    do {
-        zs.next_out = reinterpret_cast<Bytef*>(outbuffer);
-        zs.avail_out = CHUNK_SIZE;
-
-        ret = inflate(&zs, 0);
-
-        if (decompressedData.size() < zs.total_out)
-            decompressedData.insert(decompressedData.end(), outbuffer, outbuffer + CHUNK_SIZE - zs.avail_out);
-    } while (ret == Z_OK);
-
-    inflateEnd(&zs);
-
-    if (ret != Z_STREAM_END)
-        throw(std::runtime_error("Error while decompressing: " + std::to_string(ret)));
-
-    return decompressedData;
-}
--- a/src/lib/zlibutil.hpp
+++ b/src/lib/zlibutil.hpp
@ -1,27 +0,0 @@
-// Copyright 2024, FOSS-VG Developers and Contributers
-//
-// Author(s):
-//  Jocadbz
-//
-// This program is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Affero General Public License as published
-// by the Free Software Foundation, version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// version 3 along with this program.
-// If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
-
-#include <vector>
-
-#ifndef ZLIBUTIL_H
-#define ZLIBUTIL_H
-
-std::vector<char> compressData(const char* data, int size);
-std::vector<char> decompressData(const char* data, int size);
-
-#endif // ZLIBUTIL_H
--- a/src/tools/zlibutil.cpp
+++ b/src/tools/zlibutil.cpp
@ -1,4 +1,4 @@
-// Copyright 2024, FOSS-VG Developers and Contributers
+// Copyright 2022, FOSS-VG Developers and Contributers
 //
 // Author(s):
 //  Jocadbz
@ -23,18 +23,87 @@
 #include <tinyutf8/tinyutf8.h>
 #include <zlib/zlib.h>
 #include <cstring>
-#include <fstream>

 #include "../lib/cli.hpp"
 #include "../lib/file.hpp"
-#include "../lib/zlibutil.hpp"

 #define EXIT_SUCCESS 0
 #define EXIT_RUNTIME 1
 #define EXIT_USAGE   2

+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <zlib.h>
+
 #define CHUNK_SIZE 16384 // Chunk size

+
+std::vector<char> compressData(const char* data, int size) {
+    z_stream zs;
+    memset(&zs, 0, sizeof(zs));
+
+    if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) != Z_OK)
+        throw(std::runtime_error("deflateInit failed while compressing."));
+
+    zs.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(data));
+    zs.avail_in = size;
+
+    int ret;
+    char outbuffer[CHUNK_SIZE];
+    std::vector<char> compressedData;
+
+    do {
+        zs.next_out = reinterpret_cast<Bytef*>(outbuffer);
+        zs.avail_out = CHUNK_SIZE;
+
+        ret = deflate(&zs, Z_FINISH);
+
+        if (compressedData.size() < zs.total_out)
+            compressedData.insert(compressedData.end(), outbuffer, outbuffer + CHUNK_SIZE - zs.avail_out);
+    } while (ret == Z_OK);
+
+    deflateEnd(&zs);
+
+    if (ret != Z_STREAM_END)
+        throw(std::runtime_error("Error while compressing: " + std::to_string(ret)));
+
+    return compressedData;
+}
+
+
+std::vector<char> decompressData(const char* data, int size) {
+    z_stream zs;
+    memset(&zs, 0, sizeof(zs));
+
+    if (inflateInit(&zs) != Z_OK)
+        throw(std::runtime_error("inflateInit failed while decompressing."));
+
+    zs.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(data));
+    zs.avail_in = size;
+
+    int ret;
+    char outbuffer[CHUNK_SIZE];
+    std::vector<char> decompressedData;
+
+    do {
+        zs.next_out = reinterpret_cast<Bytef*>(outbuffer);
+        zs.avail_out = CHUNK_SIZE;
+
+        ret = inflate(&zs, 0);
+
+        if (decompressedData.size() < zs.total_out)
+            decompressedData.insert(decompressedData.end(), outbuffer, outbuffer + CHUNK_SIZE - zs.avail_out);
+    } while (ret == Z_OK);
+
+    inflateEnd(&zs);
+
+    if (ret != Z_STREAM_END)
+        throw(std::runtime_error("Error while decompressing: " + std::to_string(ret)));
+
+    return decompressedData;
+}
+
 /*
 Finally, the main file
 ⠀⠀⠀⠀⠀⠀⠀⢠⣤⣄⣀⣠⣤⣶⣿⣯⣿⣽⣾⣷⣶⣶⡦⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
Author	SHA1	Message	Date
BodgeMaster	e87435dc0b	tools/zlibutil: Chnage CLI to act more like other compression utilities Compression is now the implied default action, decompress with the -d flag.	2024-03-24 19:48:15 +01:00
BodgeMaster	e0cb220d37	resources/region_files: add a zlib compressed chunk	2024-03-24 18:58:26 +01:00
BodgeMaster	b5bb2f45c1	Build system: start moving the download handler to its own file	2024-03-24 18:11:28 +01:00
BodgeMaster	f35211689e	scripts/lib: Fix a bug in the `remove` function	2024-03-24 14:53:57 +01:00
BodgeMaster	248175e0e1	test/hexnet: remove useless (unimplemented) test	2024-03-24 13:27:56 +01:00
BodgeMaster	f563f96e87	Code style guidelines and resources/README: Minor documentation changes	2024-03-24 13:27:56 +01:00
BodgeMaster	f20ed8b123	lib/net/*: Move stuff around I did this months ago with the intention to finally start implementing networking.... Yeah, that definitely panned out. Also, Git is drunk with how it says files have been renamed, they’re just empty apart from the license notice.	2024-03-24 13:27:56 +01:00
BodgeMaster	487d8f1636	tools: Add zlibutil Splitting one of Joca’s commits by topic - Bodge Add zlibutil.cpp and zlib to the project's dependencies. - Joca	2024-03-24 13:27:16 +01:00
BodgeMaster	34e19486d6	gitignore: Ignore Sublime Text’s files Splitting Joca’s commit by topic	2024-03-24 12:05:20 +01:00