games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

More robust checks for old saves removal

Browse Source
This commit is contained in:
Ivan Savenko
2025-01-01 20:57:43 +00:00
parent dfa8a956cc
commit 33daf5c199
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/NetPacksLobbyServer.cpp
View File

@@ -454,10 +454,19 @@ void ApplyOnServerNetPackVisitor::visitLobbyDelete(LobbyDelete & pack)
return;
}
auto file = boost::filesystem::canonical(*name);
boost::filesystem::remove(file);
if(boost::filesystem::is_empty(file.parent_path()))
boost::filesystem::remove(file.parent_path());
boost::system::error_code ec;
auto file = boost::filesystem::canonical(*name, ec);
if (ec)
{
logGlobal->error("Failed to delete file '%s'. Reason: %s", res.getOriginalName(), ec.message());
}
else
{
boost::filesystem::remove(file);
if(boost::filesystem::is_empty(file.parent_path()))
boost::filesystem::remove(file.parent_path());
}
}
else if(pack.type == LobbyDelete::EType::SAVEGAME_FOLDER)
{
@@ -468,8 +477,17 @@ void ApplyOnServerNetPackVisitor::visitLobbyDelete(LobbyDelete & pack)
logGlobal->error("Failed to find folder with name '%s'", res.getOriginalName());
return;
}
boost::system::error_code ec;
auto folder = boost::filesystem::canonical(*name);
boost::filesystem::remove_all(folder);
if (ec)
{
logGlobal->error("Failed to delete folder '%s'. Reason: %s", res.getOriginalName(), ec.message());
}
else
{
boost::filesystem::remove_all(folder);
}
}
LobbyUpdateState lus;