refactor: always use fs logic (#1037)

Author: Disservin

app/src/cli/cli.cpp

@@ -1,13 +1,13 @@
 #include <cli/cli.hpp>
 
 #include <algorithm>
+#include <filesystem>
 #include <sstream>
 #include <string_view>
 #include <type_traits>
 
 #include <cli/cli_args.hpp>
 #include <cli/sanitize.hpp>
-#include <core/filesystem/file_system.hpp>
 #include <core/logger/logger.hpp>
 #include <core/rand.hpp>
 #include <matchmaking/output/output_factory.hpp>
@@ -123,7 +123,7 @@ TimeControl::Limits parseTc(const std::string& tcString) {
     if (has_minutes) {
         const auto clock_vector = str_utils::splitString(remainingStringVector, ':');
         tc.time                 = static_cast<int64_t>(std::stod(clock_vector[0]) * 1000 * 60) +
-                  static_cast<int64_t>(std::stod(clock_vector[1]) * 1000);
+                                  static_cast<int64_t>(std::stod(clock_vector[1]) * 1000);
     } else {
         tc.time = static_cast<int64_t>(std::stod(remainingStringVector) * 1000);
     }
@@ -259,11 +259,9 @@ void parseOpening(const KeyValuePairs& params, ArgumentData& argument_data) {
                 argument_data.tournament_config.opening.format = FormatType::PGN;
             }
 
-#ifndef NO_STD_FILESYSTEM
             if (!std::filesystem::exists(value)) {
                 throw fastchess_exception("Opening file does not exist: " + value);
             }
-#endif
         } else if (key == "format") {
             if (value == "epd") {
                 argument_data.tournament_config.opening.format = FormatType::EPD;

app/src/cli/sanitize.cpp

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include <core/filesystem/fd_limit.hpp>
-#include <core/filesystem/file_system.hpp>
 #include <core/logger/logger.hpp>
 #include <matchmaking/sprt/sprt.hpp>
 #include <types/exception.hpp>
@@ -124,11 +123,7 @@ void validateEngine(EngineConfiguration& config) {
         throw fastchess_exception("Error; cannot use tc and st together!");
     }
 
-#ifndef NO_STD_FILESYSTEM
-    std::filesystem::path enginePath = config.cmd;
-    if (!config.dir.empty()) {
-        enginePath = (std::filesystem::path(config.dir) / config.cmd);
-    }
+    auto enginePath = config.getEnginePath();
 
     if (!config.dir.empty() || enginePath.is_absolute()) {
         if (!std::filesystem::is_regular_file(enginePath)) {
@@ -141,8 +136,7 @@ void validateEngine(EngineConfiguration& config) {
         std::filesystem::path p(config.cmd);
         config.name = p.stem().string();
     }
-#endif
-    
+
     if (config.name.empty()) {
         throw fastchess_exception("Error; please specify a name for each engine!");
     }
@@ -169,7 +163,7 @@ void sanitize(std::vector<EngineConfiguration>& configs) {
     std::unordered_map<std::string, int> seen;
     for (auto& config : configs) {
         int& n = seen[config.name];
-    
+
         if (n++ > 0) {
             config.name += "_" + std::to_string(n);
         }

app/src/core/filesystem/file_system.hpp

@@ -1,13 +1,12 @@
 #pragma once
 
 #include <chrono>
+#include <filesystem>
 #include <functional>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include <core/filesystem/file_system.hpp>
-
 namespace fastchess::engine::process {
 
 enum class Standard { INPUT, OUTPUT, ERR };
@@ -71,13 +70,9 @@ class IProcess {
 
    protected:
     [[nodiscard]] std::string getPath(const std::string& dir, const std::string& cmd) const {
-        std::string path = (dir == "." ? "" : dir) + cmd;
-#ifndef NO_STD_FILESYSTEM
         // convert path to a filesystem path
         auto p = std::filesystem::path(dir) / std::filesystem::path(cmd);
-        path   = p.string();
-#endif
-        return path;
+        return p.string();
     }
 
     bool realtime_logging_ = true;

app/src/engine/process/iprocess.hpp

@@ -1,7 +1,5 @@
 #include <matchmaking/syzygy.hpp>
 
-#include <core/filesystem/file_system.hpp>
-
 #include <pyrrhic/tbprobe.h>
 
 #include <cassert>

app/src/matchmaking/syzygy.cpp

@@ -1,9 +1,11 @@
 #pragma once
 
 #include <cstdint>
+#include <filesystem>
 #include <optional>
 #include <string>
 #include <vector>
+#include <filesystem>
 
 #include <core/helper.hpp>
 #include <game/timecontrol/timecontrol.hpp>
@@ -57,6 +59,14 @@ struct EngineConfiguration {
 
         return std::nullopt;
     }
+
+    std::filesystem::path getEnginePath() const {
+        if (!dir.empty()) {
+            return std::filesystem::path(dir) / cmd;
+        }
+
+        return std::filesystem::path(cmd);
+    }
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(EngineConfiguration, name, dir, cmd, args, restart, options, limit, variant)