diff --git a/src/modern/ui/demo_files.cpp b/src/modern/ui/demo_files.cpp index 52d06da..5e07635 100644 --- a/src/modern/ui/demo_files.cpp +++ b/src/modern/ui/demo_files.cpp @@ -210,7 +210,7 @@ void DemoFiles::validate(const Json &data) const { DemoFileEntry DemoFiles::decode(const fs::path &file, const std::string &raw) const { DemoFileEntry row; row.id = editor::utf8(file.filename()); row.token = content::sha256(raw); row.bytes = raw.size(); - row.modified = stamp(std::chrono::file_clock::to_sys(fs::last_write_time(file))); + row.modified = stamp(std::chrono::time_point_cast(std::chrono::file_clock::to_sys(fs::last_write_time(file)))); const auto value = Json::parse(raw); if (value.value("schema", "") == "openbmh-ui-file@1") { const auto expected_kind = kind_ == DemoFileKind::career ? "career" : "desktop"; @@ -316,7 +316,7 @@ DemoFileEntry DemoFiles::import_file(const fs::path &file) { void DemoFiles::export_file(const std::string &id, const std::string &expected, const fs::path &destination, bool overwrite) const { const auto entry = read(id, expected); validate_export_destination(root_, destination); - safe_directory(destination.has_parent_path() ? destination.parent_path() : fs::path(".")); + safe_directory(fs::weakly_canonical(destination.has_parent_path() ? destination.parent_path() : fs::path("."))); const Json envelope = {{"schema", "openbmh-ui-file@1"}, {"kind", kind_ == DemoFileKind::career ? "career" : "desktop"}, {"name", entry.name}, {"created", entry.created}, {"world", world_ ? world_->manifest().value("id", "") : ""}, {"world_revision", world_ ? content::sha256(world_->manifest().dump()) : ""}, {"data", entry.data}, diff --git a/tests/modern_files_ui_tests.cpp b/tests/modern_files_ui_tests.cpp index dd52664..ccc1d1e 100644 --- a/tests/modern_files_ui_tests.cpp +++ b/tests/modern_files_ui_tests.cpp @@ -137,6 +137,10 @@ void files() { std::error_code base_alias_error; fs::create_directory_symlink(directory,base_alias,base_alias_error); if(!base_alias_error){DemoFiles aliased(base_alias,DemoFileKind::career,fixture.world);require(aliased.read(renamed.id,renamed.token).data==payload,"Base directory alias failed");fs::remove(base_alias);} + const auto export_base=fixture.root/"external-export-base";fs::create_directories(export_base); + const auto export_base_alias=fixture.root/"external-export-base-alias"; + std::error_code export_base_alias_error;fs::create_directory_symlink(export_base,export_base_alias,export_base_alias_error); + if(!export_base_alias_error){saves.export_file(renamed.id,renamed.token,export_base_alias/"copy.json");require(fs::is_regular_file(export_base/"copy.json"),"Explicit external export base alias failed");fs::remove(export_base_alias);} saves.export_file(renamed.id, renamed.token, exported, true); require(bmh::editor::read_file(exported) == export_before, "Confirmed external export no longer works"); auto damaged = Json::parse(export_before); damaged["data"]["cash"] = 123;