nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

atomic saving (#5792)

Browse Source 
prefer rename to copy/delete, this avoids issues with partial writes
This commit is contained in:
Philip Dubé
2025-09-18 20:29:21 +00:00
committed by GitHub
parent 7cce840472
commit b944d01b12
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
soh/soh/SaveManager.cpp
View File

@@ -1055,19 +1055,17 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
output.close(); output.close();
#endif #endif
#if defined(__SWITCH__) || defined(__WIIU__)
if (std::filesystem::exists(fileName)) { if (std::filesystem::exists(fileName)) {
std::filesystem::remove(fileName); std::filesystem::remove(fileName);
} }
#if defined(__SWITCH__) || defined(__WIIU__)
copy_file(tempFile.c_str(), fileName.c_str()); copy_file(tempFile.c_str(), fileName.c_str());
#else
std::filesystem::copy_file(tempFile, fileName);
#endif
if (std::filesystem::exists(tempFile)) { if (std::filesystem::exists(tempFile)) {
std::filesystem::remove(tempFile); std::filesystem::remove(tempFile);
} }
#else
std::filesystem::rename(tempFile, fileName);
#endif
delete saveContext; delete saveContext;
InitMeta(fileNum); InitMeta(fileNum);
@@ -1164,15 +1162,12 @@ void SaveManager::LoadFile(int fileNum) {
std::string newFileName = Ship::Context::GetPathRelativeToAppDirectory("Save") + std::string newFileName = Ship::Context::GetPathRelativeToAppDirectory("Save") +
("/file" + std::to_string(fileNum + 1) + "-" + ("/file" + std::to_string(fileNum + 1) + "-" +
std::to_string(GetUnixTimestamp()) + ".bak"); std::to_string(GetUnixTimestamp()) + ".bak");
std::filesystem::path newFile(newFileName);
#if defined(__SWITCH__) || defined(__WIIU__) #if defined(__SWITCH__) || defined(__WIIU__)
copy_file(fileName.c_str(), newFile.c_str()); copy_file(fileName.c_str(), newFileName.c_str());
#else
std::filesystem::copy_file(fileName, newFile);
#endif
std::filesystem::remove(fileName); std::filesystem::remove(fileName);
#else
std::filesystem::rename(fileName, newFileName);
#endif
SohGui::RegisterPopup( SohGui::RegisterPopup(
"Outdated Randomizer Save", "Outdated Randomizer Save",
"The SoH version in the file in slot " + std::to_string(fileNum + 1) + "The SoH version in the file in slot " + std::to_string(fileNum + 1) +
@@ -1229,16 +1224,15 @@ void SaveManager::LoadFile(int fileNum) {
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnLoadFile>(fileNum); GameInteractor::Instance->ExecuteHooks<GameInteractor::OnLoadFile>(fileNum);
} catch (const std::exception& e) { } catch (const std::exception& e) {
input.close(); input.close();
std::filesystem::path newFile( std::string newFileName =
Ship::Context::GetPathRelativeToAppDirectory("Save") + Ship::Context::GetPathRelativeToAppDirectory("Save") +
("/file" + std::to_string(fileNum + 1) + "-" + std::to_string(GetUnixTimestamp()) + ".bak")); ("/file" + std::to_string(fileNum + 1) + "-" + std::to_string(GetUnixTimestamp()) + ".bak");
#if defined(__SWITCH__) || defined(__WIIU__) #if defined(__SWITCH__) || defined(__WIIU__)
copy_file(fileName.c_str(), newFile.c_str()); copy_file(fileName.c_str(), newFileName.c_str());
#else
std::filesystem::copy_file(fileName, newFile);
#endif
std::filesystem::remove(fileName); std::filesystem::remove(fileName);
#else
std::filesystem::rename(fileName, newFileName);
#endif
SohGui::RegisterPopup("Error loading save file", "A problem occurred loading the save in slot " + SohGui::RegisterPopup("Error loading save file", "A problem occurred loading the save in slot " +
std::to_string(fileNum + 1) + std::to_string(fileNum + 1) +
".\nSave file corruption is suspected.\n" + ".\nSave file corruption is suspected.\n" +