From 07533cb0c4b6b0fe38b343e9ccc16794bc4adaa2 Mon Sep 17 00:00:00 2001 From: Amos Date: Thu, 2 Jun 2022 15:20:22 +0200 Subject: [PATCH] packedstore cleanup Add const qualifiers to params. Enable compression flags. --- r5dev/public/utility.cpp | 10 ++++---- r5dev/vpklib/packedstore.cpp | 45 ++++++++++++++++++------------------ r5dev/vpklib/packedstore.h | 10 ++++---- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/r5dev/public/utility.cpp b/r5dev/public/utility.cpp index 0f2c0eb8..59e7b50d 100644 --- a/r5dev/public/utility.cpp +++ b/r5dev/public/utility.cpp @@ -138,7 +138,7 @@ void PrintLastError(void) size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL); - spdlog::error("{}\n", messageBuffer); + spdlog::error("{:s}\n", messageBuffer); LocalFree(messageBuffer); } } @@ -248,7 +248,7 @@ string GetExtension(const string& svInput) // For removing extensions from file names. string RemoveExtension(const string& svInput) { - string::size_type nPos = svInput.find_last_of("."); + string::size_type nPos = svInput.find_last_of('.'); if (nPos == string::npos) { return svInput; @@ -269,7 +269,7 @@ string GetFileName(const string& svInput, bool bRemoveExtension, bool bWindows) { nPos = svInput.rfind('/'); } - if (nPos != std::string::npos) + if (nPos != string::npos) { if (bRemoveExtension) { @@ -294,11 +294,11 @@ string RemoveFileName(const string& svInput, bool bWindows) string::size_type nPos; if (bWindows) { - nPos = svInput.find_last_of("\\"); + nPos = svInput.find_last_of('\\'); } else { - nPos = svInput.find_last_of("/"); + nPos = svInput.find_last_of('/'); } if (nPos == string::npos) { diff --git a/r5dev/vpklib/packedstore.cpp b/r5dev/vpklib/packedstore.cpp index 557e8b01..c98bbb85 100644 --- a/r5dev/vpklib/packedstore.cpp +++ b/r5dev/vpklib/packedstore.cpp @@ -21,7 +21,7 @@ void CPackedStore::InitLzCompParams(void) /*| PARAMETERS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||*/ m_lzCompParams.m_dict_size_log2 = RVPK_DICT_SIZE; m_lzCompParams.m_level = lzham_compress_level::LZHAM_COMP_LEVEL_FASTER; - //m_lzCompParams.m_compress_flags = lzham_compress_flags::LZHAM_COMP_FLAG_DETERMINISTIC_PARSING | lzham_compress_flags::LZHAM_COMP_FLAG_TRADEOFF_DECOMPRESSION_RATE_FOR_COMP_RATIO; + m_lzCompParams.m_compress_flags = lzham_compress_flags::LZHAM_COMP_FLAG_DETERMINISTIC_PARSING | lzham_compress_flags::LZHAM_COMP_FLAG_TRADEOFF_DECOMPRESSION_RATE_FOR_COMP_RATIO; m_lzCompParams.m_max_helper_threads = -1; } @@ -36,22 +36,6 @@ void CPackedStore::InitLzDecompParams(void) m_lzDecompParams.m_struct_size = sizeof(lzham_decompress_params); } -//----------------------------------------------------------------------------- -// Purpose: obtains archive chunk path for specific file -//----------------------------------------------------------------------------- -string CPackedStore::GetPackChunkFile(string svPackDirFile, int iArchiveIndex) -{ - /*| ARCHIVES ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||*/ - string svPackChunkFile = StripLocalePrefix(svPackDirFile); - ostringstream oss; - - oss << std::setw(3) << std::setfill('0') << iArchiveIndex; - string svPackChunkIndex = "pak000_" + oss.str(); - - StringReplace(svPackChunkFile, "pak000_dir", svPackChunkIndex); - return svPackChunkFile; -} - //----------------------------------------------------------------------------- // Purpose: returns populated pack dir struct for specified pack dir file //----------------------------------------------------------------------------- @@ -88,6 +72,22 @@ VPKDir_t CPackedStore::GetPackDirFile(string svPackDirFile) return vpk_dir; } +//----------------------------------------------------------------------------- +// Purpose: obtains archive chunk path for specific file +//----------------------------------------------------------------------------- +string CPackedStore::GetPackChunkFile(const string& svPackDirFile, int iArchiveIndex) +{ + /*| ARCHIVES ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||*/ + string svPackChunkFile = StripLocalePrefix(svPackDirFile); + ostringstream oss; + + oss << std::setw(3) << std::setfill('0') << iArchiveIndex; + string svPackChunkIndex = "pak000_" + oss.str(); + + StringReplace(svPackChunkFile, "pak000_dir", svPackChunkIndex); + return svPackChunkFile; +} + //----------------------------------------------------------------------------- // Purpose: obtains and returns the entry block to the vector //----------------------------------------------------------------------------- @@ -102,7 +102,7 @@ vector CPackedStore::GetEntryBlocks(CIOStream* pReader) { while (!(svName = pReader->ReadString()).empty()) { - string svFilePath = FormatBlockPath(svName, svPath, svExtension); + string svFilePath = FormatBlockPath(svPath, svName, svExtension); vBlocks.push_back(VPKEntryBlock_t(pReader, svFilePath)); } } @@ -129,7 +129,7 @@ vector CPackedStore::GetEntryPaths(const string& svPathIn) const //----------------------------------------------------------------------------- // Purpose: formats the entry block path //----------------------------------------------------------------------------- -string CPackedStore::FormatBlockPath(string svName, string svPath, string svExtension) +string CPackedStore::FormatBlockPath(string svPath, const string& svName, const string& svExtension) { if (!svPath.empty()) { @@ -141,7 +141,7 @@ string CPackedStore::FormatBlockPath(string svName, string svPath, string svExte //----------------------------------------------------------------------------- // Purpose: strips locale prefix from file path //----------------------------------------------------------------------------- -string CPackedStore::StripLocalePrefix(string svPackDirFile) +string CPackedStore::StripLocalePrefix(const string& svPackDirFile) { fs::path fspPackDirFile(svPackDirFile); string svFileName = fspPackDirFile.filename().u8string(); @@ -189,7 +189,7 @@ void CPackedStore::ValidateCRC32PostDecomp(const string& svAssetFile) } } -void CPackedStore::PackAll(string svDirIn, string svPathOut) +void CPackedStore::PackAll(const string& svDirIn, const string& svPathOut) { CIOStream writer("client_mp_rr_canyonlands_staging.bsp.pak000_000.vpk", CIOStream::Mode_t::WRITE); @@ -237,7 +237,7 @@ void CPackedStore::PackAll(string svDirIn, string svPathOut) //----------------------------------------------------------------------------- // Purpose: extracts all files from specified vpk file //----------------------------------------------------------------------------- -void CPackedStore::UnpackAll(VPKDir_t vpkDir, string svPathOut) +void CPackedStore::UnpackAll(VPKDir_t vpkDir, const string& svPathOut) { for (int i = 0; i < vpkDir.m_vsvArchives.size(); i++) { @@ -461,7 +461,6 @@ void VPKDir_t::Build(const string& svFileName, const vector& vE for (VPKEntryBlock_t vBlock : vEntryBlocks) { string svExtension = GetExtension(vBlock.m_svBlockPath); - string svFileName = GetFileName(vBlock.m_svBlockPath, true); string svFilePath = RemoveFileName(vBlock.m_svBlockPath); if (svFilePath.empty()) diff --git a/r5dev/vpklib/packedstore.h b/r5dev/vpklib/packedstore.h index 862c006d..6842abdd 100644 --- a/r5dev/vpklib/packedstore.h +++ b/r5dev/vpklib/packedstore.h @@ -102,13 +102,13 @@ public: void InitLzCompParams(void); void InitLzDecompParams(void); VPKDir_t GetPackDirFile(string svPackDirFile); - string GetPackChunkFile(string svPackDirFile, int iArchiveIndex); + string GetPackChunkFile(const string& svPackDirFile, int iArchiveIndex); vector GetEntryBlocks(CIOStream* reader); vector GetEntryPaths(const string& svPathIn) const; - string FormatBlockPath(string svName, string svPath, string svExtension); - string StripLocalePrefix(string svPackDirFile); - void PackAll(string svDirIn, string svPathOut = ""); - void UnpackAll(VPKDir_t vpk, string svPathOut = ""); + string FormatBlockPath(string svName, const string& svPath, const string& svExtension); + string StripLocalePrefix(const string& svPackDirFile); + void PackAll(const string& svDirIn, const string& svPathOut = ""); + void UnpackAll(VPKDir_t vpk, const string& svPathOut = ""); void ValidateAdler32PostDecomp(const string& svDirAsset); void ValidateCRC32PostDecomp(const string& svDirAsset); };