From dd4fdb6cbd421d48cd6f3e54b2a50feb5a3eb297 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 13 Jan 2024 14:09:37 +0100 Subject: [PATCH] VokLib: rename pack/unpack methods More correct names. --- src/common/callback.cpp | 4 ++-- src/revpk/revpk.cpp | 4 ++-- src/vpklib/packedstore.cpp | 4 ++-- src/vpklib/packedstore.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/callback.cpp b/src/common/callback.cpp index f9f80b94..230a6323 100644 --- a/src/common/callback.cpp +++ b/src/common/callback.cpp @@ -651,7 +651,7 @@ void VPK_Pack_f(const CCommand& args) CPackedStoreBuilder builder; builder.InitLzEncoder(fs_packedstore_max_helper_threads->GetInt(), fs_packedstore_compression_level->GetString()); - builder.PackWorkspace(pair, fs_packedstore_workspace->GetString(), "vpk/"); + builder.PackStore(pair, fs_packedstore_workspace->GetString(), "vpk/"); timer.End(); Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds()); @@ -683,7 +683,7 @@ void VPK_Unpack_f(const CCommand& args) CPackedStoreBuilder builder; builder.InitLzDecoder(); - builder.UnpackWorkspace(vpk, fs_packedstore_workspace->GetString()); + builder.UnpackStore(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 a205733f..48ba0521 100644 --- a/src/revpk/revpk.cpp +++ b/src/revpk/revpk.cpp @@ -126,7 +126,7 @@ static void ReVPK_Pack(const CCommand& args) argCount > 7 ? (std::min)(atoi(args.Arg(7)), LZHAM_MAX_HELPER_THREADS) : -1, // Num threads. argCount > 8 ? args.Arg(8) : "default"); // Compress level. - builder.PackWorkspace(pair, + builder.PackStore(pair, argCount > 5 ? args.Arg(5) : "ship/", // Workspace path. argCount > 6 ? args.Arg(6) : "vpk/"); // build path. @@ -159,7 +159,7 @@ static void ReVPK_Unpack(const CCommand& args) CPackedStoreBuilder builder; builder.InitLzDecoder(); - builder.UnpackWorkspace(vpk, argCount > 3 ? args.Arg(3) : "ship/"); + builder.UnpackStore(vpk, argCount > 3 ? args.Arg(3) : "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 7951f52b..24e1f636 100644 --- a/src/vpklib/packedstore.cpp +++ b/src/vpklib/packedstore.cpp @@ -437,7 +437,7 @@ bool CPackedStoreBuilder::Deduplicate(const uint8_t* pEntryBuffer, VPKChunkDescr // *workspaceName - // *buildPath - //----------------------------------------------------------------------------- -void CPackedStoreBuilder::PackWorkspace(const VPKPair_t& vpkPair, const char* workspaceName, const char* buildPath) +void CPackedStoreBuilder::PackStore(const VPKPair_t& vpkPair, const char* workspaceName, const char* buildPath) { CUtlString workspacePath(workspaceName); workspacePath.AppendSlash(); @@ -570,7 +570,7 @@ void CPackedStoreBuilder::PackWorkspace(const VPKPair_t& vpkPair, const char* wo // Input : &vpkDirectory - // &workspaceName - //----------------------------------------------------------------------------- -void CPackedStoreBuilder::UnpackWorkspace(const VPKDir_t& vpkDir, const char* workspaceName) +void CPackedStoreBuilder::UnpackStore(const VPKDir_t& vpkDir, const char* workspaceName) { CUtlString workspacePath(workspaceName); diff --git a/src/vpklib/packedstore.h b/src/vpklib/packedstore.h index ea2582b5..6533554e 100644 --- a/src/vpklib/packedstore.h +++ b/src/vpklib/packedstore.h @@ -201,8 +201,8 @@ public: bool Deduplicate(const uint8_t* pEntryBuffer, VPKChunkDescriptor_t& descriptor, const size_t chunkIndex); - void PackWorkspace(const VPKPair_t& vpkPair, const char* workspaceName, const char* buildPath); - void UnpackWorkspace(const VPKDir_t& vpkDir, const char* workspaceName = ""); + void PackStore(const VPKPair_t& vpkPair, const char* workspaceName, const char* buildPath); + void UnpackStore(const VPKDir_t& vpkDir, const char* workspaceName = ""); private: lzham_compress_params m_Encoder; // LZham compression parameters.