From a92847fa7afb5a61ea8be9a47d5f11a8dac6eecd Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Fri, 12 Jan 2024 11:02:54 +0100 Subject: [PATCH] VpkLib: rename CPackedStore to CPackedStoreBuilder Avoid confusion with the game's CPackedStore class. --- src/common/callback.cpp | 12 ++++++------ src/revpk/revpk.cpp | 12 ++++++------ src/vpklib/packedstore.cpp | 10 +++++----- src/vpklib/packedstore.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/common/callback.cpp b/src/common/callback.cpp index c066e714..7b7f1970 100644 --- a/src/common/callback.cpp +++ b/src/common/callback.cpp @@ -648,10 +648,10 @@ void VPK_Pack_f(const CCommand& args) Msg(eDLL_T::FS, "*** Starting VPK build command for: '%s'\n", pair.m_DirName.Get()); timer.Start(); - CPackedStore packedStore; + CPackedStoreBuilder builder; - packedStore.InitLzCompParams(fs_packedstore_compression_level->GetString(), fs_packedstore_max_helper_threads->GetInt()); - packedStore.PackWorkspace(pair, fs_packedstore_workspace->GetString(), "vpk/"); + builder.InitLzCompParams(fs_packedstore_compression_level->GetString(), fs_packedstore_max_helper_threads->GetInt()); + builder.PackWorkspace(pair, fs_packedstore_workspace->GetString(), "vpk/"); timer.End(); Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds()); @@ -680,10 +680,10 @@ void VPK_Unpack_f(const CCommand& args) Msg(eDLL_T::FS, "*** Starting VPK extraction command for: '%s'\n", arg.Get()); timer.Start(); - CPackedStore packedStore; + CPackedStoreBuilder builder; - packedStore.InitLzDecompParams(); - packedStore.UnpackWorkspace(vpk, fs_packedstore_workspace->GetString()); + builder.InitLzDecompParams(); + builder.UnpackWorkspace(vpk, fs_packedstore_workspace->GetString()); timer.End(); Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds()); diff --git a/src/revpk/revpk.cpp b/src/revpk/revpk.cpp index d5307fe1..217f021a 100644 --- a/src/revpk/revpk.cpp +++ b/src/revpk/revpk.cpp @@ -85,10 +85,10 @@ static void ReVPK_Pack(const CCommand& args) Msg(eDLL_T::FS, "*** Starting VPK build command for: '%s'\n", pair.m_DirName.Get()); timer.Start(); - CPackedStore packedStore; + CPackedStoreBuilder builder; - packedStore.InitLzCompParams(); - packedStore.PackWorkspace(pair, "ship/", "vpk/"); + builder.InitLzCompParams(); + builder.PackWorkspace(pair, "ship/", "vpk/"); timer.End(); Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds()); @@ -114,10 +114,10 @@ static void ReVPK_Unpack(const CCommand& args) Msg(eDLL_T::FS, "*** Starting VPK extraction command for: '%s'\n", arg.Get()); timer.Start(); - CPackedStore packedStore; + CPackedStoreBuilder builder; - packedStore.InitLzDecompParams(); - packedStore.UnpackWorkspace(vpk, "ship/"); + builder.InitLzDecompParams(); + builder.UnpackWorkspace(vpk, "ship/"); timer.End(); Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds()); diff --git a/src/vpklib/packedstore.cpp b/src/vpklib/packedstore.cpp index f7c3002f..b6f79b13 100644 --- a/src/vpklib/packedstore.cpp +++ b/src/vpklib/packedstore.cpp @@ -61,7 +61,7 @@ static lzham_compress_level DetermineCompressionLevel(const char* compressionLev //----------------------------------------------------------------------------- // Purpose: initialize parameters for compression algorithm //----------------------------------------------------------------------------- -void CPackedStore::InitLzCompParams(const char* compressionLevel, const lzham_int32 maxHelperThreads) +void CPackedStoreBuilder::InitLzCompParams(const char* compressionLevel, const lzham_int32 maxHelperThreads) { /*| PARAMETERS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||*/ m_lzCompParams.m_struct_size = sizeof(lzham_compress_params); @@ -78,7 +78,7 @@ void CPackedStore::InitLzCompParams(const char* compressionLevel, const lzham_in //----------------------------------------------------------------------------- // Purpose: initialize parameters for decompression algorithm //----------------------------------------------------------------------------- -void CPackedStore::InitLzDecompParams(void) +void CPackedStoreBuilder::InitLzDecompParams(void) { /*| PARAMETERS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||*/ m_lzDecompParams.m_struct_size = sizeof(lzham_decompress_params); @@ -412,7 +412,7 @@ static void ValidateCRC32PostDecomp(const CUtlString& assetPath, const uint32_t // chunkIndex - // Output : true if the chunk was deduplicated, false otherwise //----------------------------------------------------------------------------- -bool CPackedStore::Deduplicate(const uint8_t* pEntryBuffer, VPKChunkDescriptor_t& descriptor, const size_t chunkIndex) +bool CPackedStoreBuilder::Deduplicate(const uint8_t* pEntryBuffer, VPKChunkDescriptor_t& descriptor, const size_t chunkIndex) { string entryHash(reinterpret_cast(pEntryBuffer), descriptor.m_nUncompressedSize); entryHash = sha1(entryHash); @@ -436,7 +436,7 @@ bool CPackedStore::Deduplicate(const uint8_t* pEntryBuffer, VPKChunkDescriptor_t // *workspaceName - // *buildPath - //----------------------------------------------------------------------------- -void CPackedStore::PackWorkspace(const VPKPair_t& vpkPair, const char* workspaceName, const char* buildPath) +void CPackedStoreBuilder::PackWorkspace(const VPKPair_t& vpkPair, const char* workspaceName, const char* buildPath) { CUtlString workspacePath(workspaceName); workspacePath.AppendSlash(); @@ -569,7 +569,7 @@ void CPackedStore::PackWorkspace(const VPKPair_t& vpkPair, const char* workspace // Input : &vpkDirectory - // &workspaceName - //----------------------------------------------------------------------------- -void CPackedStore::UnpackWorkspace(const VPKDir_t& vpkDir, const char* workspaceName) +void CPackedStoreBuilder::UnpackWorkspace(const VPKDir_t& vpkDir, const char* workspaceName) { CUtlString workspacePath(workspaceName); diff --git a/src/vpklib/packedstore.h b/src/vpklib/packedstore.h index 483e314a..01a53338 100644 --- a/src/vpklib/packedstore.h +++ b/src/vpklib/packedstore.h @@ -193,7 +193,7 @@ struct VPKPair_t //----------------------------------------------------------------------------- // VPK utility class. //----------------------------------------------------------------------------- -class CPackedStore +class CPackedStoreBuilder { public: void InitLzCompParams(const char* compressionLevel = "default", const lzham_int32 maxHelperThreads = -1);