fix relative paths in settings

Author: jordan-evens

src/cpp/firestarr.cpp

@@ -60,17 +60,17 @@ int main(const int argc, const char* const argv[])
       fs::logging::debug("Compiled on: %s", COMPILED_ON);
       parser.show_help_and_exit();
     }
-    static const auto dir_log = settings.log_directory();
+    // HACK: know saving settings made output_directory already
     static const auto dir_out = settings.output_directory;
-    make_directory_recursive(dir_log.c_str());
+    static const auto dir_log = settings.log_directory();
     if (dir_log != dir_out)
     {
+      make_directory_recursive(dir_log.c_str());
       logging::warning(
         "Log file (%s) is being written outside the output directory (%s)",
         settings.log_file.c_str(),
         dir_out.c_str()
       );
-      make_directory_recursive(dir_out.c_str());
     }
     const auto opened_log = Log::openLogFile(settings.log_file.c_str());
     if (!opened_log)

src/cpp/fs/ArgumentParser.cpp

@@ -323,7 +323,7 @@ ArgumentParser::ArgumentParser(
   auto dir_settings = std::filesystem::exists(output_directory + "settings.ini")
                       ? output_directory
                       : binary_directory_;
-  Settings::setRoot(binary_directory_, dir_settings);
+  Settings::setRoot(binary_directory_, std::filesystem::absolute(dir_settings));
   logging::check_fatal(nullptr != PARSER, "Parser initialized multiple times");
   PARSER = this;
   add_usages(usages);

src/cpp/fs/Environment.cpp

@@ -69,7 +69,8 @@ Environment Environment::loadEnvironment(
   auto found_best = false;
   if (!perimeter.empty())
   {
-    for_info = make_unique<GridBase>(read_header(perimeter));
+    LazyPath p{path, perimeter};
+    for_info = make_unique<GridBase>(read_header(p.canonical()));
     logging::info("Perimeter projection is %s", for_info->proj4().c_str());
   }
   for (const auto& raster : rasters)

src/cpp/fs/Model.cpp

@@ -350,7 +350,8 @@ void Model::makeStarts(
   if (!perim.empty())
   {
     logging::note("Initializing from perimeter %s", string(perim).c_str());
-    perimeter_ = make_shared<Perimeter>(perim, point, *env_);
+    LazyPath p{settings.output_directory, perim};
+    perimeter_ = make_shared<Perimeter>(p.canonical(), point, *env_);
     // HACK: if perimeter is only one cell then use position not perimeter so it can bounce if
     // non-fuel
     const auto& burned = perimeter_->burned;
@@ -1220,7 +1221,8 @@ int Model::runScenarios(
   }
   else
   {
-    model.readWeather(yesterday, start_point.latitude(), weather_input);
+    const LazyPath wx{settings.output_directory, weather_input};
+    model.readWeather(yesterday, start_point.latitude(), wx.canonical());
     if (model.wx_.empty())
     {
       logging::fatal("No weather provided");

src/cpp/fs/Settings.cpp

@@ -191,6 +191,11 @@ Settings::Settings(const string dir_binary, const string dir_settings)
       }
       in.close();
     }
+    if (settings_.first.empty())
+    {
+      // could work if all arguments were specified as cli args (not currently possible)
+      logging::warning("Settings file %s is empty", filename.c_str());
+    }
     if (const auto value = get_value(settings_, "OUTPUT_DIRECTORY", false); "INVALID" != value)
     {
       output_directory = value;
@@ -359,10 +364,12 @@ Settings::Settings(const string dir_binary, const string dir_settings)
 }
 void Settings::saveTo(const string& output_directory) const noexcept
 {
+  make_directory_recursive(output_directory.c_str());
   const pushd dir{output_directory};
   const auto filename = string(output_directory) + "settings.ini";
   ofstream out{filename};
   auto put = [&](const string& key, const string& comment, const auto& value) {
+    // FIX: use original string instead of parsed and stringified input so nothing can change
     static constexpr auto MAX_PRECISION = std::numeric_limits<double>::digits10 + 1;
     // make sure we don't lose precision or results will differ when run with settings file
     out << "# " << comment << "\n";
@@ -373,7 +380,6 @@ void Settings::saveTo(const string& output_directory) const noexcept
   // auto abs = std::filesystem::absolute(output_directory).lexically_normal();
   auto abs = dir.current_directory;
   auto relative = [&](const string& path) {
-    const pushd dir{output_directory};
     // return std::filesystem::relative(path.c_str(), abs.c_str());
     return std::filesystem::relative(path.c_str());
     // return path;

src/cpp/fs/Util.cpp

@@ -4,6 +4,7 @@
 #include "Log.h"
 #include "TimeUtil.h"
 // HACK: complains when importing otherwise
+#include <filesystem>
 #include <regex>
 #ifdef _WIN32
 #include <direct.h>
@@ -309,13 +310,17 @@ string get_canonical_path(const char* const dir_root, string path)
 #endif
     if (!path.starts_with("/"))
   {
-    const pushd dir{dir_root};
-    // not an absolute path
-    // if binary path starts with ./ then ignore it
-    std::filesystem::path p =
-      (0 == strcmp("./", dir_root) || 0 == strcmp(".\\", dir_root)) ? path : (dir_root + path);
     try
     {
+      // not an absolute path so should be relative to root
+      const pushd dir{dir_root};
+      auto p = std::filesystem::absolute(std::filesystem::relative(path));
+      logging::note(
+        "Relative to %s path %s becomes %s",
+        dir_root,
+        p.c_str(),
+        std::filesystem::canonical(p).c_str()
+      );
 #ifdef _WIN32
       path = std::filesystem::canonical(p).generic_string();
 #else

src/cpp/fs/Util.h

@@ -500,6 +500,10 @@ class LazyPath
 public:
   LazyPath() = default;
   LazyPath(const string dir_root, const string path) : dir_root_{dir_root}, path_{path} { }
+  LazyPath(const string_view dir_root, const string_view path)
+    : LazyPath(string(dir_root), string(path))
+  { }
+  bool empty() const { return path_.empty(); }
   const char* canonical() const
   {
     if (nullptr == canonical_path_)