diff --git a/DataSpec/DNACommon/PAK.cpp b/DataSpec/DNACommon/PAK.cpp index d47cc337d..ba86043e1 100644 --- a/DataSpec/DNACommon/PAK.cpp +++ b/DataSpec/DNACommon/PAK.cpp @@ -437,8 +437,7 @@ std::string PAKRouter::getBestEntryName(const IDType& entry) const } template -bool PAKRouter::extractResources(const BRIDGETYPE& pakBridge, bool force, bool precedenceSharesOnly, - hecl::BlenderToken& btok, +bool PAKRouter::extractResources(const BRIDGETYPE& pakBridge, bool force, hecl::BlenderToken& btok, std::function progress) { enterPAKBridge(pakBridge); @@ -453,22 +452,6 @@ bool PAKRouter::extractResources(const BRIDGETYPE& pakBridge, bool f if (extractor.weight != w) continue; -#if 0 - /* This is used to ensure parallel extracts won't collide files */ - if (precedenceSharesOnly) - { - auto sharedSearch = m_sharedEntries.find(item->id); - if (sharedSearch != m_sharedEntries.cend()) - { - if (sharedSearch->second.first != reinterpret_cast(m_curBridgeIdx.get())) - { - ++count; - continue; - } - } - } -#endif - std::string bestName = getBestEntryName(*item); hecl::SystemStringView bestNameView(bestName); float thisFac = ++count / fsz; diff --git a/DataSpec/DNACommon/PAK.hpp b/DataSpec/DNACommon/PAK.hpp index a251cc39f..ad0376af4 100644 --- a/DataSpec/DNACommon/PAK.hpp +++ b/DataSpec/DNACommon/PAK.hpp @@ -159,8 +159,7 @@ public: std::string getBestEntryName(const EntryType& entry) const; std::string getBestEntryName(const IDType& entry) const; - bool extractResources(const BRIDGETYPE& pakBridge, bool force, bool precedenceSharesOnly, - hecl::BlenderToken& btok, + bool extractResources(const BRIDGETYPE& pakBridge, bool force, hecl::BlenderToken& btok, std::function progress); const typename BRIDGETYPE::PAKType::Entry* lookupEntry(const IDType& entry, diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp index 24ba97aed..9a6ecdf16 100644 --- a/DataSpec/SpecMP1.cpp +++ b/DataSpec/SpecMP1.cpp @@ -274,7 +274,7 @@ struct SpecMP1 : SpecBase hecl::SystemString pakName = sysName.sys_str(); process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok) { - m_pakRouter.extractResources(pak, force, true, btok, + m_pakRouter.extractResources(pak, force, btok, [&](const hecl::SystemChar* substr, float factor) { std::unique_lock lk(msgLock); diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp index 8226c40e2..931ae5b56 100644 --- a/DataSpec/SpecMP2.cpp +++ b/DataSpec/SpecMP2.cpp @@ -256,7 +256,7 @@ struct SpecMP2 : SpecBase hecl::SystemString pakName = sysName.sys_str(); process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok) { - m_pakRouter.extractResources(pak, force, true, btok, + m_pakRouter.extractResources(pak, force, btok, [&](const hecl::SystemChar* substr, float factor) { std::unique_lock lk(msgLock); diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp index c08f4043f..21e1b424a 100644 --- a/DataSpec/SpecMP3.cpp +++ b/DataSpec/SpecMP3.cpp @@ -387,7 +387,7 @@ struct SpecMP3 : SpecBase hecl::SystemString pakName = sysName.sys_str(); process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok) { - m_pakRouter.extractResources(pak, force, true, btok, + m_pakRouter.extractResources(pak, force, btok, [&](const hecl::SystemChar* substr, float factor) { std::unique_lock lk(msgLock); @@ -447,7 +447,7 @@ struct SpecMP3 : SpecBase hecl::SystemString pakName = sysName.sys_str(); process.addLambdaTransaction([&, pakName](hecl::BlenderToken& btok) { - m_fePakRouter.extractResources(pak, force, true, btok, + m_fePakRouter.extractResources(pak, force, btok, [&](const hecl::SystemChar* substr, float factor) { std::unique_lock lk(msgLock);