From 13f518d7735cdd5855bb062aa92675edbad0e6cd Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 5 Jun 2022 20:55:34 +0200 Subject: [PATCH] Fixed VPK manifest bug Fixed bug where VPK root character gets written to the manifest file. Show detailed data sharing statistics. --- r5dev/vpklib/packedstore.cpp | 6 ++++-- r5dev/vstdlib/callback.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/r5dev/vpklib/packedstore.cpp b/r5dev/vpklib/packedstore.cpp index 1d7c950e..eb4b7b1f 100644 --- a/r5dev/vpklib/packedstore.cpp +++ b/r5dev/vpklib/packedstore.cpp @@ -468,6 +468,8 @@ void CPackedStore::PackAll(const VPKPair_t& vPair, const string& svPathIn, const nSharedTotal += it->second.m_nCompressedSize; nSharedCount++; bShared = true; + + DevMsg(eDLL_T::FS, "Mapping block '%lld' to existing block at '0x%llx' ('%s')\n", i, it->second.m_nArchiveOffset, svEntryHash.c_str()); } else // Add entry to hashmap. { @@ -514,7 +516,6 @@ void CPackedStore::UnpackAll(const VPKDir_t& vpkDir, const string& svPathOut) string svPath = fspVpkPath.parent_path().u8string() + '\\' + vpkDir.m_vsvArchives[i]; CIOStream iStream(svPath, CIOStream::Mode_t::READ); // Create stream to read from each archive. - //for ( VPKEntryBlock_t vBlock : vpkDir.m_vvEntryBlocks) for ( size_t j = 0; j < vpkDir.m_vvEntryBlocks.size(); j++) { if (vpkDir.m_vvEntryBlocks[j].m_iArchiveIndex != static_cast(i)) @@ -588,7 +589,8 @@ void CPackedStore::UnpackAll(const VPKDir_t& vpkDir, const string& svPathOut) //----------------------------------------------------------------------------- VPKEntryBlock_t::VPKEntryBlock_t(CIOStream* pReader, string svBlockPath) { - std::replace(svBlockPath.begin(), svBlockPath.end(), '\\', '/'); // Flip windows-style backslash to forward slash. + StringReplace(svBlockPath, "\\", "/"); // Flip windows-style backslash to forward slash. + StringReplace(svBlockPath, " /", "" ); // Remove space character representing VPK root. this->m_svBlockPath = svBlockPath; // Set path of block. pReader->Read(this->m_nCrc32); // diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp index 357229b3..b38069e3 100644 --- a/r5dev/vstdlib/callback.cpp +++ b/r5dev/vstdlib/callback.cpp @@ -638,6 +638,7 @@ void VPK_Pack_f(const CCommand& args) float duration = msEnd.count() - msStart.count(); DevMsg(eDLL_T::FS, "*** Time elapsed: '%.3f' seconds\n", (duration / 1000)); + DevMsg(eDLL_T::FS, "\n"); } /* @@ -668,6 +669,7 @@ void VPK_Unpack_f(const CCommand& args) float duration = msEnd.count() - msStart.count(); DevMsg(eDLL_T::FS, "*** Time elapsed: '%.3f' seconds\n", (duration / 1000)); + DevMsg(eDLL_T::FS, "\n"); } /*