R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Put launcher playlists parsing code in try catch block

Browse Source 
Avoid crash due to exceptions.
This commit is contained in:
Kawe Mazidjatari 2023-04-03 18:38:20 +02:00
parent 7de0ed24b1
commit 32d04645ca
1 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
r5dev/sdklauncher/basepanel.cpp
View File

@ -718,28 +718,29 @@ void CSurface::LaunchGame(Forms::Control* pSender)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSurface::ParseMaps() void CSurface::ParseMaps()
{ {
if (!fs::exists("vpk")) const fs::path vpkPath("vpk");
if (!fs::exists(vpkPath))
{ {
return; return;
} }
fs::directory_iterator fsDir("vpk"); fs::directory_iterator directoryIterator(vpkPath);
std::regex rgArchiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" }; std::regex archiveRegex{ R"([^_]*_(.*)(.bsp.pak000_dir).*)" };
std::smatch smRegexMatches; std::smatch regexMatches;
m_MapCombo->Items.Add(""); m_MapCombo->Items.Add("");
for (const fs::directory_entry& dEntry : fsDir) for (const fs::directory_entry& directoryEntry : directoryIterator)
{ {
std::string svFileName = dEntry.path().u8string(); std::string fileName = directoryEntry.path().u8string();
std::regex_search(svFileName, smRegexMatches, rgArchiveRegex); std::regex_search(fileName, regexMatches, archiveRegex);
if (!smRegexMatches.empty()) if (!regexMatches.empty())
{ {
if (smRegexMatches[1].str().compare("frontend") == 0) if (regexMatches[1].str().compare("frontend") == 0)
{ {
continue; continue;
} }
else if (smRegexMatches[1].str().compare("mp_common") == 0) else if (regexMatches[1].str().compare("mp_common") == 0)
{ {
if (!this->m_MapCombo->Items.Contains("mp_lobby")) if (!this->m_MapCombo->Items.Contains("mp_lobby"))
{ {
@ -747,9 +748,9 @@ void CSurface::ParseMaps()
} }
continue; continue;
} }
else if (!this->m_MapCombo->Items.Contains(smRegexMatches[1].str().c_str())) else if (!this->m_MapCombo->Items.Contains(regexMatches[1].str().c_str()))
{ {
this->m_MapCombo->Items.Add(smRegexMatches[1].str().c_str()); this->m_MapCombo->Items.Add(regexMatches[1].str().c_str());
} }
} }
} }
@ -760,28 +761,41 @@ void CSurface::ParseMaps()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CSurface::ParsePlaylists() void CSurface::ParsePlaylists()
{ {
fs::path fsPlaylistPath(Format("platform\\%s", this->m_PlaylistFileTextBox->Text().ToCString())); fs::path playlistPath(Format("platform\\%s", this->m_PlaylistFileTextBox->Text().ToCString()));
m_PlaylistCombo->Items.Add(""); m_PlaylistCombo->Items.Add("");
if (fs::exists(fsPlaylistPath))
{
bool bOk{ };
std::ifstream iFile(fsPlaylistPath);
vdf::object vRoot = vdf::read(iFile, &bOk);
if (bOk) if (!fs::exists(playlistPath))
{
return;
}
bool success{ };
std::ifstream iFile(playlistPath);
vdf::object vRoot = vdf::read(iFile, &success);
if (!success)
{
printf("%s: Failed to parse VDF file: '%s'\n", __FUNCTION__,
playlistPath.u8string().c_str());
return;
}
try
{
const auto& vcPlaylists = vRoot.childs.at("Playlists");
for (auto [id, it] = std::tuple<int, decltype(vcPlaylists->childs.begin())>
{ 1, vcPlaylists->childs.begin() }; it != vcPlaylists->childs.end(); id++, it++)
{ {
const auto& vcPlaylists = vRoot.childs.at("Playlists"); if (!this->m_PlaylistCombo->Items.Contains(it->first.c_str()))
for (auto[id, it] = std::tuple<int, decltype(vcPlaylists->childs.begin())>
{ 1, vcPlaylists->childs.begin() }; it != vcPlaylists->childs.end(); id++, it++)
{ {
if (!this->m_PlaylistCombo->Items.Contains(it->first.c_str())) this->m_PlaylistCombo->Items.Add(it->first.c_str());
{
this->m_PlaylistCombo->Items.Add(it->first.c_str());
}
} }
} }
} }
catch (const std::exception& e)
{
printf("%s: Exception while parsing VDF file: %s\n", __FUNCTION__, e.what());
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------