From c6ffdedb81a5aef884843054d0c5bba7030b2dd4 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Sun, 8 Sep 2024 16:15:45 +0200
Subject: [PATCH] feat: load raw game folder relative to binary to be able to
 always locate it, even when in a different working directory

---
 src/Linker/LinkerArgs.cpp | 27 +++++++++---
 src/Linker/LinkerArgs.h   | 92 ++++++++++++++++++++-------------------
 2 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/src/Linker/LinkerArgs.cpp b/src/Linker/LinkerArgs.cpp
index 1e6c927c..1513b99b 100644
--- a/src/Linker/LinkerArgs.cpp
+++ b/src/Linker/LinkerArgs.cpp
@@ -109,13 +109,14 @@ const CommandLineOption* const COMMAND_LINE_OPTIONS[]{
 };
 
 LinkerArgs::LinkerArgs()
-    : m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v<decltype(COMMAND_LINE_OPTIONS)>),
-      m_base_pattern(R"(\?base\?)"),
-      m_game_pattern(R"(\?game\?)"),
-      m_project_pattern(R"(\?project\?)"),
+    : m_verbose(false),
       m_base_folder_depends_on_project(false),
       m_out_folder_depends_on_project(false),
-      m_verbose(false)
+      m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v<decltype(COMMAND_LINE_OPTIONS)>),
+      m_bin_pattern(R"(\?bin\?)"),
+      m_base_pattern(R"(\?base\?)"),
+      m_game_pattern(R"(\?game\?)"),
+      m_project_pattern(R"(\?project\?)")
 {
 }
 
@@ -139,6 +140,12 @@ void LinkerArgs::PrintVersion()
     std::cout << "OpenAssetTools Linker " << std::string(GIT_VERSION) << "\n";
 }
 
+void LinkerArgs::SetBinFolder(const char* argv0)
+{
+    const fs::path path(argv0);
+    m_bin_folder = path.parent_path().string();
+}
+
 void LinkerArgs::SetVerbose(const bool isVerbose)
 {
     m_verbose = isVerbose;
@@ -205,8 +212,12 @@ std::set<std::string> LinkerArgs::GetSearchPathsForProject(const std::set<std::s
             continue;
         }
 
-        out.emplace(std::regex_replace(
-            std::regex_replace(std::regex_replace(path, m_project_pattern, projectName), m_game_pattern, gameName), m_base_pattern, basePath));
+        fs::path p(std::regex_replace(std::regex_replace(std::regex_replace(std::regex_replace(path, m_project_pattern, projectName), m_game_pattern, gameName),
+                                                         m_base_pattern,
+                                                         basePath),
+                                      m_bin_pattern,
+                                      m_bin_folder));
+        out.emplace(p.make_preferred().string());
     }
 
     return out;
@@ -237,6 +248,8 @@ bool LinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldContin
         return true;
     }
 
+    SetBinFolder(argv[0]);
+
     m_project_specifiers_to_build = m_argument_parser.GetArguments();
     if (m_project_specifiers_to_build.empty())
     {
diff --git a/src/Linker/LinkerArgs.h b/src/Linker/LinkerArgs.h
index 4eb7459c..8b465fa2 100644
--- a/src/Linker/LinkerArgs.h
+++ b/src/Linker/LinkerArgs.h
@@ -10,51 +10,17 @@
 class LinkerArgs
 {
 public:
-    static constexpr const char* PATTERN_BASE = "?base?";
-    static constexpr const char* PATTERN_GAME = "?game?";
-    static constexpr const char* PATTERN_PROJECT = "?project?";
+    static constexpr auto PATTERN_BIN = "?bin?";
+    static constexpr auto PATTERN_BASE = "?base?";
+    static constexpr auto PATTERN_GAME = "?game?";
+    static constexpr auto PATTERN_PROJECT = "?project?";
 
-    static constexpr const char* DEFAULT_BASE_FOLDER = ".";
-    static constexpr const char* DEFAULT_BASE_FOLDER_MOD_TOOLS = "..";
-    static constexpr const char* DEFAULT_OUTPUT_FOLDER = "?base?/zone_out/?project?";
-    static constexpr const char* DEFAULT_ASSET_SEARCH_PATH = "?base?/raw;?base?/raw/?game?;?base?/zone_raw/?project?";
-    static constexpr const char* DEFAULT_GDT_SEARCH_PATH = "?base?/source_data;?base?/zone_raw/?project?/source_data";
-    static constexpr const char* DEFAULT_SOURCE_SEARCH_PATH = "?base?/zone_source;?base?/zone_raw/?project?/zone_source";
-
-private:
-    ArgumentParser m_argument_parser;
-    std::regex m_base_pattern;
-    std::regex m_game_pattern;
-    std::regex m_project_pattern;
-
-    /**
-     * \brief Prints a command line usage help text for the Linker tool to stdout.
-     */
-    static void PrintUsage();
-    static void PrintVersion();
-
-    void SetVerbose(bool isVerbose);
-
-    _NODISCARD std::string GetBasePathForProject(const std::string& projectName) const;
-    void SetDefaultBasePath();
-    _NODISCARD std::set<std::string> GetProjectIndependentSearchPaths(const std::set<std::string>& set) const;
-    _NODISCARD std::set<std::string>
-        GetSearchPathsForProject(const std::set<std::string>& set, const std::string& gameName, const std::string& projectName) const;
-
-public:
-    std::vector<std::string> m_zones_to_load;
-    std::vector<std::string> m_project_specifiers_to_build;
-
-    std::string m_base_folder;
-    std::string m_out_folder;
-    bool m_base_folder_depends_on_project;
-    bool m_out_folder_depends_on_project;
-
-    std::set<std::string> m_asset_search_paths;
-    std::set<std::string> m_gdt_search_paths;
-    std::set<std::string> m_source_search_paths;
-
-    bool m_verbose;
+    static constexpr auto DEFAULT_BASE_FOLDER = ".";
+    static constexpr auto DEFAULT_BASE_FOLDER_MOD_TOOLS = "..";
+    static constexpr auto DEFAULT_OUTPUT_FOLDER = "?base?/zone_out/?project?";
+    static constexpr auto DEFAULT_ASSET_SEARCH_PATH = "?bin?/raw/?game?;?base?/raw;?base?/raw/?game?;?base?/zone_raw/?project?";
+    static constexpr auto DEFAULT_GDT_SEARCH_PATH = "?base?/source_data;?base?/zone_raw/?project?/source_data";
+    static constexpr auto DEFAULT_SOURCE_SEARCH_PATH = "?base?/zone_source;?base?/zone_raw/?project?/zone_source";
 
     LinkerArgs();
     bool ParseArgs(int argc, const char** argv, bool& shouldContinue);
@@ -73,4 +39,42 @@ public:
     _NODISCARD std::set<std::string> GetAssetSearchPathsForProject(const std::string& gameName, const std::string& projectName) const;
     _NODISCARD std::set<std::string> GetGdtSearchPathsForProject(const std::string& gameName, const std::string& projectName) const;
     _NODISCARD std::set<std::string> GetSourceSearchPathsForProject(const std::string& projectName) const;
+
+    bool m_verbose;
+
+    std::vector<std::string> m_zones_to_load;
+    std::vector<std::string> m_project_specifiers_to_build;
+
+    std::string m_bin_folder;
+    std::string m_base_folder;
+    std::string m_out_folder;
+    bool m_base_folder_depends_on_project;
+    bool m_out_folder_depends_on_project;
+
+    std::set<std::string> m_asset_search_paths;
+    std::set<std::string> m_gdt_search_paths;
+    std::set<std::string> m_source_search_paths;
+
+private:
+    /**
+     * \brief Prints a command line usage help text for the Linker tool to stdout.
+     */
+    static void PrintUsage();
+    static void PrintVersion();
+
+    void SetBinFolder(const char* argv0);
+
+    void SetVerbose(bool isVerbose);
+
+    _NODISCARD std::string GetBasePathForProject(const std::string& projectName) const;
+    void SetDefaultBasePath();
+    _NODISCARD std::set<std::string> GetProjectIndependentSearchPaths(const std::set<std::string>& set) const;
+    _NODISCARD std::set<std::string>
+        GetSearchPathsForProject(const std::set<std::string>& set, const std::string& gameName, const std::string& projectName) const;
+
+    ArgumentParser m_argument_parser;
+    std::regex m_bin_pattern;
+    std::regex m_base_pattern;
+    std::regex m_game_pattern;
+    std::regex m_project_pattern;
 };