fix utf8 filepaths

moritz-h · moritz-h · commit e9835d641e66 · 2026-03-24T23:27:13.000+01:00
diff --git a/cmake/deps/spdlog.cmake b/cmake/deps/spdlog.cmake
@@ -10,6 +10,9 @@ FetchContent_Declare(spdlog
 message(STATUS "Fetch spdlog ...")
 option(SPDLOG_DISABLE_DEFAULT_LOGGER "" ON)
 option(SPDLOG_BUILD_PIC "" "${SATISFACTORY3DMAP_BUILD_PIC}")
+if (WIN32)
+  option(SPDLOG_WCHAR_FILENAMES "" ON)
+endif ()
 FetchContent_MakeAvailable(spdlog)
 set_target_properties(spdlog PROPERTIES
   FOLDER libs
diff --git a/libsave/include/SatisfactorySave/IO/IOStream.h b/libsave/include/SatisfactorySave/IO/IOStream.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "../Utils/StringUtils.h"
 #include "satisfactorysave_export.h"
 
 namespace SatisfactorySave {
@@ -156,7 +157,7 @@ namespace SatisfactorySave {
             file_.exceptions(std::ifstream::badbit);
             file_.open(path, std::ios::binary);
             if (!file_.is_open()) {
-                throw std::runtime_error("FileIStream: Failed to open file for reading: " + path.string());
+                throw std::runtime_error("FileIStream: Failed to open file for reading: " + pathToString(path));
             }
             file_.seekg(0, std::ios::end);
             size_ = static_cast<pos_type>(file_.tellg());
@@ -222,7 +223,7 @@ namespace SatisfactorySave {
             file_.exceptions(std::ofstream::badbit);
             file_.open(path, std::ios::binary | std::ios::trunc);
             if (!file_.is_open()) {
-                throw std::runtime_error("FileOStream: Failed to open file for writing: " + path.string());
+                throw std::runtime_error("FileOStream: Failed to open file for writing: " + pathToString(path));
             }
         }
 
diff --git a/libsave/include/SatisfactorySave/Utils/StringUtils.h b/libsave/include/SatisfactorySave/Utils/StringUtils.h
@@ -5,11 +5,27 @@
 #include <functional>
 #include <sstream>
 #include <string>
+#include <string_view>
 #include <vector>
 
 #include "satisfactorysave_export.h"
 
 namespace SatisfactorySave {
+    static inline std::filesystem::path toPath(std::string_view s) {
+        return {std::u8string(s.begin(), s.end())};
+    }
+
+    static inline std::filesystem::path toPath(const char* s) {
+        if (s == nullptr) {
+            return {};
+        }
+        return toPath(std::string_view(s));
+    }
+
+    static inline std::string pathToString(const std::filesystem::path& p) {
+        std::u8string u8 = p.u8string();
+        return {u8.begin(), u8.end()};
+    }
 
     static inline std::vector<std::string> splitPathName(const std::string& name) {
         std::vector<std::string> result;
@@ -26,9 +42,9 @@ namespace SatisfactorySave {
     static inline std::vector<std::string> splitPathName(const std::filesystem::path& path) {
         std::vector<std::string> segments;
         for (const auto& element : path) {
-            const auto& s = element.string();
-            if (!s.empty() && s != "/") {
-                segments.push_back(s);
+            const auto& s = element.u8string();
+            if (!s.empty() && s != u8"/") {
+                segments.emplace_back(s.begin(), s.end());
             }
         }
         return segments;
diff --git a/libsave/src/Pak/IoStoreFile.cpp b/libsave/src/Pak/IoStoreFile.cpp
@@ -2,6 +2,7 @@
 
 #include "GameTypes/UE/Core/IO/IoStore.h"
 #include "IO/OodleUtils.h"
+#include "Utils/StringUtils.h"
 #include "Utils/VectorUtils.h"
 
 SatisfactorySave::DirectoryIndexReader::DirectoryIndexReader(const FIoDirectoryIndexResource& res) : res_(res) {
@@ -43,12 +44,12 @@ SatisfactorySave::IoStoreFile::IoStoreFile(Private p, std::shared_ptr<PakManager
     const std::filesystem::path& path)
     : AbstractPakFile(p, std::move(pakManager)) {
     if (!std::filesystem::is_regular_file(path)) {
-        throw std::runtime_error("IoStore utoc file invalid: " + path.string());
+        throw std::runtime_error("IoStore utoc file invalid: " + pathToString(path));
     }
     std::filesystem::path ucas_path = path;
     ucas_path.replace_extension(std::filesystem::path(".ucas"));
     if (!std::filesystem::is_regular_file(ucas_path)) {
-        throw std::runtime_error("IoStore ucas file invalid: " + ucas_path.string());
+        throw std::runtime_error("IoStore ucas file invalid: " + pathToString(ucas_path));
     }
 
     IStreamArchive utocAr(path);
diff --git a/libsave/src/Pak/PakFile.cpp b/libsave/src/Pak/PakFile.cpp
@@ -12,7 +12,7 @@ SatisfactorySave::PakFile::PakFile(Private p, std::shared_ptr<PakManager> pakMan
       NumEntries(0),
       PathHashSeed(0) {
     if (!std::filesystem::is_regular_file(pakPath)) {
-        throw std::runtime_error("Pak file invalid: " + pakPath.string());
+        throw std::runtime_error("Pak file invalid: " + pathToString(pakPath));
     }
 
     pakAr_ = std::make_unique<IStreamArchive>(pakPath);
diff --git a/libsave/src/Pak/PakManager.cpp b/libsave/src/Pak/PakManager.cpp
@@ -7,7 +7,7 @@
 #include "Utils/StringUtils.h"
 
 void SatisfactorySave::PakManager::init(const std::filesystem::path& gameDir) {
-    spdlog::info("PakManager init dir: {}", gameDir.string());
+    spdlog::info("PakManager init dir: {}", pathToString(gameDir));
 
     const std::filesystem::path globalUtocPath = gameDir / "FactoryGame/Content/Paks/global.utoc";
     const std::filesystem::path mainPakPath = gameDir / "FactoryGame/Content/Paks/FactoryGame-Windows.pak";
@@ -65,7 +65,7 @@ void SatisfactorySave::PakManager::init(const std::filesystem::path& gameDir) {
         // Check if dirname matches "<ModName>/Content/Paks/Windows", if we find pak/utoc files with a different
         // structure, the assumptions made on fixing path names are probably not matching.
         const auto filePath = std::filesystem::canonical(dirEntry.path());
-        spdlog::info("Found pak/utoc file: {}", filePath.string());
+        spdlog::info("Found pak/utoc file: {}", pathToString(filePath));
         std::filesystem::path relativePath = std::filesystem::relative(filePath, modsDir);
         const auto pathSegments = splitPathName(relativePath);
         if (pathSegments.size() < 4 || pathSegments[1] != "Content" || pathSegments[2] != "Paks" ||
diff --git a/map/src/MapWindow/BaseWindow.cpp b/map/src/MapWindow/BaseWindow.cpp
@@ -11,9 +11,13 @@
 #include <implot3d.h>
 #include <spdlog/spdlog.h>
 
+#include "SatisfactorySave/Utils/StringUtils.h"
+
 #include "Utils/GLUtil.h"
 #include "Utils/ResourceUtils.h"
 
+namespace s = SatisfactorySave;
+
 namespace {
     // GLFW mods parameter is not platform independent, see https://github.com/glfw/glfw/issues/1630.
     inline int fixKeyboardMods(int mods, int key, int action) {
@@ -157,10 +161,10 @@ Satisfactory3DMap::BaseWindow::BaseWindow(std::string title, int width, int heig
         }
     });
     glfwSetDropCallback(window_, [](GLFWwindow* window, int path_count, const char* paths[]) {
-        std::vector<std::string> path_list;
+        std::vector<std::filesystem::path> path_list;
         path_list.reserve(path_count);
         for (int i = 0; i < path_count; i++) {
-            path_list.emplace_back(std::string(paths[i]));
+            path_list.emplace_back(s::toPath(paths[i]));
         }
         static_cast<BaseWindow*>(glfwGetWindowUserPointer(window))->dropEvent(path_list);
     });
diff --git a/map/src/MapWindow/BaseWindow.h b/map/src/MapWindow/BaseWindow.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <filesystem>
 #include <memory>
 #include <string>
 #include <vector>
@@ -31,7 +32,7 @@ namespace Satisfactory3DMap {
             [[maybe_unused]] int mods) {}
         virtual void mouseMoveEvent([[maybe_unused]] double xpos, [[maybe_unused]] double ypos) {}
         virtual void mouseScrollEvent([[maybe_unused]] double xoffset, [[maybe_unused]] double yoffset) {}
-        virtual void dropEvent([[maybe_unused]] const std::vector<std::string>& paths) {}
+        virtual void dropEvent([[maybe_unused]] const std::vector<std::filesystem::path>& paths) {}
 
         std::shared_ptr<Configuration> config_;
         std::shared_ptr<StringSetting> imguiIniSetting_;
diff --git a/map/src/MapWindow/Config/Configuration.cpp b/map/src/MapWindow/Config/Configuration.cpp
@@ -5,8 +5,12 @@
 
 #include <spdlog/spdlog.h>
 
+#include "SatisfactorySave/Utils/StringUtils.h"
+
 #include "Utils/FilesystemUtil.h"
 
+namespace s = SatisfactorySave;
+
 Satisfactory3DMap::Configuration::Configuration() {
     auto cfgFile = getConfigFile();
     if (!std::filesystem::exists(cfgFile)) {
@@ -15,10 +19,10 @@ Satisfactory3DMap::Configuration::Configuration() {
     }
     cfgFile = std::filesystem::canonical(cfgFile);
     if (!std::filesystem::is_regular_file(cfgFile)) {
-        spdlog::error("Config file path is not a file: {}", cfgFile.string());
+        spdlog::error("Config file path is not a file: {}", s::pathToString(cfgFile));
         return;
     }
-    spdlog::info("Read config file: {}", cfgFile.string());
+    spdlog::info("Read config file: {}", s::pathToString(cfgFile));
     try {
         std::ifstream file(cfgFile);
         file >> json_;
diff --git a/map/src/MapWindow/Config/PathSetting.cpp b/map/src/MapWindow/Config/PathSetting.cpp
@@ -1,7 +1,11 @@
 #include "PathSetting.h"
 
+#include "SatisfactorySave/Utils/StringUtils.h"
+
 #include "SettingVisitor.h"
 
+namespace s = SatisfactorySave;
+
 void Satisfactory3DMap::PathSetting::accept(Satisfactory3DMap::SettingVisitor& v) {
     v.visit(*this);
 }
@@ -15,7 +19,7 @@ void Satisfactory3DMap::PathSetting::serializeFromJson(const nlohmann::json& j)
 }
 
 void Satisfactory3DMap::PathSetting::serializeToJson(nlohmann::json& j) {
-    j = value_.string();
+    j = s::pathToString(value_);
 }
 
 bool Satisfactory3DMap::PathSetting::validate(const std::filesystem::path& path) {
diff --git a/map/src/MapWindow/Config/SettingsWindow.cpp b/map/src/MapWindow/Config/SettingsWindow.cpp
@@ -3,9 +3,12 @@
 #include <imgui.h>
 #include <imgui_stdlib.h>
 
+#include "SatisfactorySave/Utils/StringUtils.h"
 #include "SettingVisitor.h"
 #include "Utils/FileDialogUtil.h"
 
+namespace s = SatisfactorySave;
+
 namespace {
     class SettingsRenderer : public Satisfactory3DMap::SettingVisitor {
         void visit(Satisfactory3DMap::BoolSetting& s) override {
@@ -43,7 +46,8 @@ namespace {
 
             ImGui::SameLine();
             if (!v.empty()) {
-                ImGui::Text("%s", v.string().c_str());
+                const auto str = s::pathToString(v);
+                ImGui::Text("%s", str.c_str());
             } else {
                 ImGui::Text("None");
             }
diff --git a/map/src/MapWindow/MapWindow.cpp b/map/src/MapWindow/MapWindow.cpp
@@ -624,7 +624,7 @@ void Satisfactory3DMap::MapWindow::mouseScrollEvent(double xoffset, double yoffs
     camera_->mouseScrollControl({xoffset, yoffset});
 }
 
-void Satisfactory3DMap::MapWindow::dropEvent(const std::vector<std::string>& paths) {
+void Satisfactory3DMap::MapWindow::dropEvent(const std::vector<std::filesystem::path>& paths) {
     if (paths.size() != 1) {
         spdlog::error("Can only read a single file!");
     }
diff --git a/map/src/MapWindow/MapWindow.h b/map/src/MapWindow/MapWindow.h
@@ -51,7 +51,7 @@ namespace Satisfactory3DMap {
         void mouseButtonEvent(int button, int action, int mods) override;
         void mouseMoveEvent(double xpos, double ypos) override;
         void mouseScrollEvent(double xoffset, double yoffset) override;
-        void dropEvent(const std::vector<std::string>& paths) override;
+        void dropEvent(const std::vector<std::filesystem::path>& paths) override;
 
         void drawObjectTreeGui(const DataView::SaveNode& n);
 
diff --git a/map/src/MapWindow/World/MapLODglTFWriter.cpp b/map/src/MapWindow/World/MapLODglTFWriter.cpp
@@ -13,9 +13,13 @@
 #include <stb_image_write.h>
 #include <tiny_gltf.h>
 
+#include "SatisfactorySave/Utils/StringUtils.h"
+
 #include "../OpenGL/Texture.h"
 #include "Utils/ResourceUtils.h"
 
+namespace s = SatisfactorySave;
+
 namespace {
     inline size_t padTo4(size_t size) {
         return (size + 3) & ~3;
@@ -239,7 +243,7 @@ void Satisfactory3DMap::MapLODglTFWriter::save(const std::filesystem::path& path
     m.defaultScene = 0;
 
     tinygltf::TinyGLTF gltf;
-    gltf.WriteGltfSceneToFile(&m, path.string(), true, true, true, true);
+    gltf.WriteGltfSceneToFile(&m, s::pathToString(path), true, true, true, true);
 }
 
 std::vector<std::byte> Satisfactory3DMap::MapLODglTFWriter::decompressTexture(GLuint compressedTex, int width,
diff --git a/map/src/Utils/FileDialogUtil.cpp b/map/src/Utils/FileDialogUtil.cpp
@@ -2,11 +2,15 @@
 
 #include <portable-file-dialogs.h>
 
+#include "SatisfactorySave/Utils/StringUtils.h"
+
+namespace s = SatisfactorySave;
+
 std::optional<std::filesystem::path> Satisfactory3DMap::openFile(std::string const& title,
     std::string const& default_path, std::vector<std::string> const& filters) {
     auto files = pfd::open_file(title, default_path, filters).result();
     if (!files.empty()) {
-        std::filesystem::path file(files[0]);
+        auto file = s::toPath(files[0]);
         if (std::filesystem::is_regular_file(file)) {
             return file;
         }
@@ -18,7 +22,7 @@ std::optional<std::filesystem::path> Satisfactory3DMap::saveFile(std::string con
     std::string const& default_path, std::vector<std::string> const& filters) {
     auto file = pfd::save_file(title, default_path, filters).result();
     if (!file.empty()) {
-        return std::filesystem::path(file);
+        return s::toPath(file);
     }
     return std::nullopt;
 }
@@ -27,7 +31,7 @@ std::optional<std::filesystem::path> Satisfactory3DMap::selectFolder(std::string
     std::string const& default_path) {
     auto dir = pfd::select_folder(title, default_path).result();
     if (!dir.empty()) {
-        std::filesystem::path dir_path(dir);
+        auto dir_path = s::toPath(dir);
         if (std::filesystem::is_directory(dir_path)) {
             return dir_path;
         }
diff --git a/map/src/main.cpp b/map/src/main.cpp
@@ -10,13 +10,17 @@
 #include "Utils/FilesystemUtil.h"
 #include "Utils/ResourceUtils.h"
 
+#ifdef _WIN32
+int wmain(int argc, wchar_t* argv[]) {
+#else
 int main(int argc, char* argv[]) {
+#endif
     try {
         Satisfactory3DMap::setConsoleUtf8();
         auto cout_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
         cout_sink->set_pattern("[%T.%e] %^[%L] %v%$");
         auto file_sink =
-            std::make_shared<spdlog::sinks::basic_file_sink_mt>(Satisfactory3DMap::getLogFile().string(), true);
+            std::make_shared<spdlog::sinks::basic_file_sink_mt>(Satisfactory3DMap::getLogFile().native(), true);
         file_sink->set_pattern("[%Y-%m-%d %T.%e %z] [%-8l] %v");
         auto logger =
             std::make_shared<spdlog::logger>("", std::initializer_list<spdlog::sink_ptr>{cout_sink, file_sink});

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ SatisfactorySave::PakFile::PakFile(Private p, std::shared_ptr<PakManager> pakMan`
`12`	`12`	`NumEntries(0),`
`13`	`13`	`PathHashSeed(0) {`
`14`	`14`	`if (!std::filesystem::is_regular_file(pakPath)) {`
`15`		`- throw std::runtime_error("Pak file invalid: " + pakPath.string());`
	`15`	`+ throw std::runtime_error("Pak file invalid: " + pathToString(pakPath));`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`pakAr_ = std::make_unique<IStreamArchive>(pakPath);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,11 @@`
`1`	`1`	`#include "PathSetting.h"`
`2`	`2`
	`3`	`+#include "SatisfactorySave/Utils/StringUtils.h"`
	`4`	`+`
`3`	`5`	`#include "SettingVisitor.h"`
`4`	`6`
	`7`	`+namespace s = SatisfactorySave;`
	`8`	`+`
`5`	`9`	`void Satisfactory3DMap::PathSetting::accept(Satisfactory3DMap::SettingVisitor& v) {`
`6`	`10`	`v.visit(*this);`
`7`	`11`	`}`
`@@ -15,7 +19,7 @@ void Satisfactory3DMap::PathSetting::serializeFromJson(const nlohmann::json& j)`
`15`	`19`	`}`
`16`	`20`
`17`	`21`	`void Satisfactory3DMap::PathSetting::serializeToJson(nlohmann::json& j) {`
`18`		`- j = value_.string();`
	`22`	`+ j = s::pathToString(value_);`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`bool Satisfactory3DMap::PathSetting::validate(const std::filesystem::path& path) {`