20253: Fixes issues storing files (#129)

howsoai · May 9, 2024 · f649820 · f649820
1 parent db5fc3b
commit f649820
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/Amalgam/importexport/FileSupportJSON.cpp b/src/Amalgam/importexport/FileSupportJSON.cpp
@@ -366,20 +366,20 @@ EvaluableNode *EvaluableNodeJSONTranslation::Load(const std::string &resource_pa
 // Save node tree to disk as JSON.
 bool EvaluableNodeJSONTranslation::Store(EvaluableNode *code, const std::string &resource_path, EvaluableNodeManager *enm, bool sort_keys)
 {
-	std::string error_string;
-	if(!Platform_IsResourcePathAccessible(resource_path, false, error_string))
-	{
-		std::cerr << "Error storing JSON to " << resource_path + ": " << error_string << std::endl;
-		return false;
-	}
-
 	auto [result, converted] = EvaluableNodeToJson(code, sort_keys);
 	if(!converted)
 	{
 		std::cerr << "Error storing JSON: cannot convert node to JSON" << std::endl;
 		return false;
 	}
+
 	std::ofstream file(resource_path);
+	if(!file.good())
+	{
+		std::cerr << "Error storing JSON: cannot write to file " +  resource_path << std::endl;
+		return false;
+	}
+
 	file << result;
 
 	return true;

diff --git a/src/Amalgam/importexport/FileSupportYAML.cpp b/src/Amalgam/importexport/FileSupportYAML.cpp
@@ -195,20 +195,19 @@ EvaluableNode *EvaluableNodeYAMLTranslation::Load(const std::string &resource_pa
 
 bool EvaluableNodeYAMLTranslation::Store(EvaluableNode *code, const std::string &resource_path, EvaluableNodeManager *enm, bool sort_keys)
 {
-	std::string error_string;
-	if(!Platform_IsResourcePathAccessible(resource_path, false, error_string))
-	{
-		std::cerr << "Error storing YAML to " + resource_path + ": " << error_string << std::endl;
-		return false;
-	}
-
 	auto [result, converted] = EvaluableNodeToYaml(code, sort_keys);
 	if(!converted)
 	{
 		std::cerr << "Error storing YAML: cannot convert node to YAML" << std::endl;
 		return false;
 	}
+
 	std::ofstream file(resource_path);
+	if(!file.good())
+	{
+		std::cerr << "Error storing JSON: cannot write to file " + resource_path << std::endl;
+		return false;
+	}
 	file << result;
 
 	return true;