Merge pull request #14 from OpenVicProject/dataloading

Dataloading scaffolding + basic culture and pop history loading

1 files changed, 69 insertions, 15 deletions

diff --git a/src/headless/main.cpp b/src/headless/main.cpp
index 70a57a9..3ae08f0 100644
--- a/src/headless/main.cpp
+++ b/src/headless/main.cpp
@@ -1,22 +1,76 @@
-#ifdef OPENVIC_HEADLESS_SIM
-#include <iostream>
-#include <string>
-#include "openvic/Simulation.hpp"
-#include "openvic/dataloader/Dataloader.hpp"
+#include <openvic-simulation/GameManager.hpp>
+#include <openvic-simulation/dataloader/Dataloader.hpp>
+#include <openvic-simulation/utility/Logger.hpp>
 
+using namespace OpenVic;
 
-int main() {
-	std::cout << "HEADLESS SIMULATION" << std::endl;
+static char const* get_program_name(char const* name) {
+	static constexpr char const* missing_name = "<program>";
+	if (name == nullptr) return missing_name;
+	char const* last_separator = name;
+	while (*name != '\0') {
+		if (*name == '/' || *name == '\\') {
+			last_separator = name + 1;
+		}
+		++name;
+	}
+	if (*last_separator == '\0') return missing_name;
+	return last_separator;
+}
+
+static bool headless_load(Dataloader::path_vector_t const& roots) {
+	bool ret = true;
+
+	Logger::set_info_func([](std::string&& str) { std::cout << str; });
+	Logger::set_warning_func([](std::string&& str) { std::cerr << str; });
+	Logger::set_error_func([](std::string&& str) { std::cerr << str; });
 
+	GameManager game_manager { []() {
+		Logger::info("State updated");
+	} };
+	Dataloader dataloader;
 
-	std::string vic2FolderLocation = "";
-	if (vic2FolderLocation.length() <= 0) {
-		std::cout << "Path to Victoria 2 folder not specified. Manually specify location: ";
-		std::cin >> vic2FolderLocation;
+	if (!dataloader.set_roots(roots)) {
+		Logger::error("Failed to set dataloader roots!");
+		ret = false;
 	}
-	std::filesystem::path path(vic2FolderLocation);
+	if (!dataloader.load_defines(game_manager)) {
+		Logger::error("Failed to load defines!");
+		ret = false;
+	}
+	if (!game_manager.load_hardcoded_defines()) {
+		Logger::error("Failed to load hardcoded defines!");
+		ret = false;
+	}
+
+	return ret;
+}
+
+int main(int argc, char const* argv[]) {
+	Dataloader::path_vector_t roots;
+	if (argc < 2) {
+		// TODO - non-Windows default paths
+		static const fs::path default_path = "C:/Program Files (x86)/Steam/steamapps/common/Victoria 2";
+
+		std::cout
+			<< "Usage: " << get_program_name(argc > 0 ? argv[0] : nullptr) << " <base defines dir> [[mod defines dir]+]\n"
+			<< "Requires defines path(s) as arguments, starting with the base defines and continuing with mods.\n"
+			<< "(Paths with spaces need to be enclosed in \"quotes\").\n"
+			<< "Defaulting to " << default_path << std::endl;
+		roots.push_back(default_path);
+	} else {
+		for (int i = 1; i < argc; ++i) {
+			roots.push_back(argv[i]);
+		}
+	}
+
+	std::cout << "!!! HEADLESS SIMULATION START !!!" << std::endl;
+
+	const bool ret = headless_load(roots);
+
+	std::cout << "!!! HEADLESS SIMULATION END !!!" << std::endl;
+
+	std::cout << "\nLoad returned: " << (ret ? "SUCCESS" : "FAILURE") << std::endl;
 
-	OpenVic::Simulation sim;
-	std::cout << (OpenVic::Dataloader::loadDir(path, sim) ? "Dataloader suceeded" : "Dataloader failed") << std::endl;
+	return ret ? 0 : -1;
 }
-#endif
\ No newline at end of file