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

VpkLib: add comments to name sanitizer

Browse Source 
Make it clear what it does.
This commit is contained in:
Kawe Mazidjatari 2024-01-14 00:18:30 +01:00
parent 0dc4b1d697
commit b1199efc64
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vpklib/packedstore.cpp
View File

@ -438,7 +438,7 @@ void CPackedStoreBuilder::PackStore(const VPKPair_t& vpkPair, const char* worksp
// NOTE: we get the entry values prior to opening the file, because if we // NOTE: we get the entry values prior to opening the file, because if we
// don't have a valid manifest file, we won't be able to build the store. // don't have a valid manifest file, we won't be able to build the store.
// If we had already opened the block file, and a one already existed, it // If we had already opened the pack file, and a one already existed, it
// would be emptied out ("wb" flag) which we want to avoid here. // would be emptied out ("wb" flag) which we want to avoid here.
if (!GetEntryValues(entryValues, workspacePath, vpkPair.m_DirName)) if (!GetEntryValues(entryValues, workspacePath, vpkPair.m_DirName))
{ {
@ -868,17 +868,20 @@ VPKDir_t::VPKDir_t(const CUtlString& dirFilePath, bool bSanitizeName)
std::cmatch regexMatches; std::cmatch regexMatches;
std::regex_search(dirFilePath.String(), regexMatches, s_BlockFileRegex); std::regex_search(dirFilePath.String(), regexMatches, s_BlockFileRegex);
if (regexMatches.empty()) if (regexMatches.empty()) // Not a block file, or not following the naming scheme.
{ {
Init(dirFilePath); Init(dirFilePath);
return; return;
} }
CUtlString sanitizedName = dirFilePath; CUtlString sanitizedName = dirFilePath; // Replace "pak000_xxx" with "pak000_dir".
sanitizedName = sanitizedName.Replace(regexMatches[0].str().c_str(), "pak000_dir"); sanitizedName = sanitizedName.Replace(regexMatches[0].str().c_str(), "pak000_dir");
bool bHasLocale = false; bool bHasLocale = false;
// Check if caller passed in a string with a locale, while also specifying
// the sanitizer parameter. Data block files don't have a locale prefix!
// The user most likely passed in an actual directory tree file name.
for (size_t i = 0; i < SDK_ARRAYSIZE(g_LanguageNames); i++) for (size_t i = 0; i < SDK_ARRAYSIZE(g_LanguageNames); i++)
{ {
if (sanitizedName.Find(g_LanguageNames[i]) != -1) if (sanitizedName.Find(g_LanguageNames[i]) != -1)
@ -888,7 +891,11 @@ VPKDir_t::VPKDir_t(const CUtlString& dirFilePath, bool bSanitizeName)
} }
} }
if (!bHasLocale) // Only sanitize if no locale was provided. // If we don't have a locale prefix, replace the target name with
// locale+target, so you get something like "englishserver", and
// then we replace the target name in the passed in string with
// the new prefix to finalize name sanitization.
if (!bHasLocale)
{ {
CUtlString packDirPrefix; CUtlString packDirPrefix;
packDirPrefix.Append(g_LanguageNames[0]); packDirPrefix.Append(g_LanguageNames[0]);