Switch to JSON for config file

rel #88

Author: fs-c

app/CMakeLists.txt

@@ -1,3 +1,12 @@
+include(FetchContent)
+
+FetchContent_Declare(
+        json
+        GIT_REPOSITORY https://github.com/nlohmann/json
+        GIT_TAG v3.11.2)
+
+FetchContent_MakeAvailable(json)
+
 add_executable(maniac-app app.cpp window.cpp
         dependencies/imgui/imgui.cpp
         dependencies/imgui/backends/imgui_impl_dx9.cpp
@@ -16,6 +25,6 @@ endif()
 target_include_directories(maniac-app PRIVATE dependencies)
 target_include_directories(maniac-app PRIVATE dependencies/imgui)
 
-target_link_libraries(maniac-app PRIVATE maniac d3d9.lib)
+target_link_libraries(maniac-app PRIVATE maniac d3d9.lib nlohmann_json::nlohmann_json)
 
 set_target_properties(maniac-app PROPERTIES OUTPUT_NAME "maniac")

app/app.cpp

@@ -1,4 +1,5 @@
 #include "window.h"
+#include "config.h"
 #include <maniac/maniac.h>
 
 static void help_marker(const char *desc) {
@@ -33,7 +34,7 @@ static void set_priority_class(int priority) {
 int main(int, char **) {
     std::string message;
 
-    maniac::config.read_from_file();
+    config::read_from_file(maniac::config);
 
     auto run = [&message](osu::Osu &osu) {
         maniac::osu = &osu;
@@ -141,7 +142,7 @@ int main(int, char **) {
         ImGui::End();
     });
 
-    maniac::config.write_to_file();
+    config::write_to_file(maniac::config);
 
     thread.request_stop();
 

app/config.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include <maniac/maniac.h>
+#include <nlohmann/json.hpp>
+
+namespace config {
+    using json = nlohmann::json;
+
+    constexpr auto format_version = 1;
+    constexpr auto file_name = "maniac-config.json";
+
+    void read_from_file(struct maniac::config &c);
+    void write_to_file(struct maniac::config &c);
+}
+
+void config::read_from_file(struct maniac::config &c) {
+    std::ifstream file(file_name);
+
+    try {
+        const auto data = json::parse(file);
+
+        c.tap_time = data["tap_time"];
+        c.mirror_mod = data["mirror_mod"];
+        c.compensation_offset = data["compensation_offset"];
+        c.randomization_mean = data["randomization_mean"];
+        c.randomization_stddev = data["randomization_stddev"];
+        c.humanization_type = data["humanization_type"];
+        c.humanization_modifier = data["humanization_modifier"];
+        c.keys = data["keys"];
+
+        debug("loaded config from file");
+    } catch (json::parse_error &err) {
+        debug("failed parsing config: '%s'", err.what());
+    }
+}
+
+void config::write_to_file(struct maniac::config &c) {
+    json data = {
+            {"format_version", format_version},
+            {"tap_time", c.tap_time},
+            {"mirror_mod", c.mirror_mod},
+            {"compensation_offset", c.compensation_offset},
+            {"randomization_mean", c.randomization_mean},
+            {"randomization_stddev", c.randomization_stddev},
+            {"humanization_type", c.humanization_type},
+            {"humanization_modifier", c.humanization_modifier},
+            {"keys", c.keys}
+    };
+
+    std::ofstream file(file_name);
+
+    file << data.dump(4) << std::endl;
+
+    debug("wrote config to file");
+}

lib/include/maniac/config.h

@@ -20,64 +20,7 @@ namespace maniac {
         int randomization_stddev = 0;
         int humanization_type = DYNAMIC_HUMANIZATION;
 
-        // TODO: This isn't configurable yet, use a non-shit config format
         std::string keys = "asdfjkl;";
-
-        // TODO: Would be good to have the read/write stuff be in a constructor/destructor
-
-        void read_from_file() {
-            std::fstream file{"maniac-config", std::fstream::binary | std::fstream::in};
-
-            if (!file.is_open()) {
-                debug("couldn't open config file for reading");
-
-                return;
-            }
-
-            int version = -1;
-
-            file.read(reinterpret_cast<char *>(&version), sizeof  version);
-
-            if (version != VERSION) {
-                // TODO: Use a non-shit config format
-                debug("config has outdated version, ignoring");
-
-                return;
-            }
-
-            file.read(reinterpret_cast<char *>(&tap_time), sizeof tap_time);
-            file.read(reinterpret_cast<char *>(&mirror_mod), sizeof mirror_mod);
-            file.read(reinterpret_cast<char *>(&compensation_offset), sizeof compensation_offset);
-            file.read(reinterpret_cast<char *>(&humanization_modifier), sizeof humanization_modifier);
-            file.read(reinterpret_cast<char *>(&randomization_mean), sizeof randomization_mean);
-            file.read(reinterpret_cast<char *>(&randomization_stddev), sizeof randomization_stddev);
-            file.read(reinterpret_cast<char *>(&humanization_type), sizeof humanization_type);
-
-            debug("loaded config from file");
-        }
-
-        void write_to_file() {
-            std::fstream file{"maniac-config", std::fstream::binary | std::fstream::trunc | std::fstream::out};
-
-            if (!file.is_open()) {
-                debug("couldn't open config file for writing");
-
-                return;
-            }
-
-            int version = VERSION;
-
-            file.write(reinterpret_cast<char *>(&version), sizeof version);
-            file.write(reinterpret_cast<char *>(&tap_time), sizeof tap_time);
-            file.write(reinterpret_cast<char *>(&mirror_mod), sizeof mirror_mod);
-            file.write(reinterpret_cast<char *>(&compensation_offset), sizeof compensation_offset);
-            file.write(reinterpret_cast<char *>(&humanization_modifier), sizeof humanization_modifier);
-            file.write(reinterpret_cast<char *>(&randomization_mean), sizeof randomization_mean);
-            file.write(reinterpret_cast<char *>(&randomization_stddev), sizeof randomization_stddev);
-            file.write(reinterpret_cast<char *>(&humanization_type), sizeof humanization_type);
-
-            debug("wrote config to file");
-        }
     };
 }
 

lib/include/maniac/process.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <stdexcept>
 #include <functional>
+#include <format>
 #include <maniac/common.h>
 #include <maniac/signature.h>
 // maniac/common.h includes windows.h, win32 headers can't be included beforehand
@@ -108,29 +109,16 @@ inline T Process::read_memory(uintptr_t address) const {
 
 template<typename T, typename Any>
 T Process::read_memory_safe(const char *name, Any addr) const {
-	// TODO: So much for "safe".
 	auto address = (uintptr_t)(void *)addr;
 
 	if (!address) {
-		// TODO: Get rid of this ASAP once std::format is out.
-		char msg[128];
-		msg[127] = '\0';
-
-		sprintf_s(msg, 128, "pointer to %s was invalid", name);
-
-		throw std::runtime_error(msg);
+		throw std::runtime_error(std::format("pointer to {} was invalid", name));
 	}
 
 	T out;
 
 	if (!read_memory(address, &out, 1)) {
-		// TODO: See above.
-		char msg[128];
-		msg[127] = '\0';
-
-		sprintf_s(msg, 128, "failed reading %s at %#x", name, address);
-
-		throw std::runtime_error(msg);
+		throw std::runtime_error(std::format("failed reading {} at {}", name, address));
 	}
 
 	debug("%s: %#x", name, (unsigned int)address);
@@ -148,7 +136,7 @@ inline void Process::send_scan_code(short code, bool down) {
 	static INPUT in;
 
 	in.type = INPUT_KEYBOARD;
-	in.ki.time = 238423874;
+	in.ki.time = 0;
 	in.ki.wScan = 0;
 	in.ki.dwExtraInfo = 0;
 	in.ki.dwFlags = down ? 0 : KEYEVENTF_KEYUP;