1 files changed, 17 insertions, 28 deletions

diff --git a/src/zenremotestore/builds/buildstorageoperations.cpp b/src/zenremotestore/builds/buildstorageoperations.cpp
index 4f1b07c37..5219e86d8 100644
--- a/src/zenremotestore/builds/buildstorageoperations.cpp
+++ b/src/zenremotestore/builds/buildstorageoperations.cpp
@@ -484,24 +484,6 @@ private:
 	uint64_t			  FilteredPerSecond = 0;
 };
 
-EPartialBlockRequestMode
-PartialBlockRequestModeFromString(const std::string_view ModeString)
-{
-	switch (HashStringAsLowerDjb2(ModeString))
-	{
-		case HashStringDjb2("false"):
-			return EPartialBlockRequestMode::Off;
-		case HashStringDjb2("zencacheonly"):
-			return EPartialBlockRequestMode::ZenCacheOnly;
-		case HashStringDjb2("mixed"):
-			return EPartialBlockRequestMode::Mixed;
-		case HashStringDjb2("true"):
-			return EPartialBlockRequestMode::All;
-		default:
-			return EPartialBlockRequestMode::Invalid;
-	}
-}
-
 std::filesystem::path
 ZenStateFilePath(const std::filesystem::path& ZenFolderPath)
 {
@@ -903,7 +885,10 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState)
 		{
 			ChunkBlockAnalyser BlockAnalyser(m_LogOutput,
 											 m_BlockDescriptions,
-											 ChunkBlockAnalyser::Options{.IsQuiet = m_Options.IsQuiet, .IsVerbose = m_Options.IsVerbose});
+											 ChunkBlockAnalyser::Options{.IsQuiet				  = m_Options.IsQuiet,
+																		 .IsVerbose				  = m_Options.IsVerbose,
+																		 .HostLatencySec		  = m_Storage.BuildStorageLatencySec,
+																		 .HostHighSpeedLatencySec = m_Storage.CacheLatencySec});
 
 			std::vector<ChunkBlockAnalyser::NeededBlock> NeededBlocks = BlockAnalyser.GetNeeded(
 				m_RemoteLookup.ChunkHashToChunkIndex,
@@ -1034,25 +1019,29 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState)
 			{
 				BlockPartialDownloadModes.resize(m_BlockDescriptions.size(), ChunkBlockAnalyser::EPartialBlockDownloadMode::Off);
 			}
-			else if (m_Options.PartialBlockRequestMode == EPartialBlockRequestMode::All)
-			{
-				BlockPartialDownloadModes.resize(m_BlockDescriptions.size(), ChunkBlockAnalyser::EPartialBlockDownloadMode::On);
-			}
 			else
 			{
 				BlockPartialDownloadModes.reserve(m_BlockDescriptions.size());
 				for (uint32_t BlockIndex = 0; BlockIndex < m_BlockDescriptions.size(); BlockIndex++)
 				{
 					const bool BlockExistInCache = ExistsResult.ExistingBlobs.contains(m_BlockDescriptions[BlockIndex].BlockHash);
-					if (m_Options.PartialBlockRequestMode == EPartialBlockRequestMode::ZenCacheOnly)
+					if (m_Options.PartialBlockRequestMode == EPartialBlockRequestMode::All)
+					{
+						BlockPartialDownloadModes.push_back(BlockExistInCache
+																? ChunkBlockAnalyser::EPartialBlockDownloadMode::MultiRangeHighSpeed
+																: ChunkBlockAnalyser::EPartialBlockDownloadMode::MultiRange);
+					}
+					else if (m_Options.PartialBlockRequestMode == EPartialBlockRequestMode::ZenCacheOnly)
 					{
-						BlockPartialDownloadModes.push_back(BlockExistInCache ? ChunkBlockAnalyser::EPartialBlockDownloadMode::On
-																			  : ChunkBlockAnalyser::EPartialBlockDownloadMode::Off);
+						BlockPartialDownloadModes.push_back(BlockExistInCache
+																? ChunkBlockAnalyser::EPartialBlockDownloadMode::MultiRangeHighSpeed
+																: ChunkBlockAnalyser::EPartialBlockDownloadMode::Off);
 					}
 					else if (m_Options.PartialBlockRequestMode == EPartialBlockRequestMode::Mixed)
 					{
-						BlockPartialDownloadModes.push_back(BlockExistInCache ? ChunkBlockAnalyser::EPartialBlockDownloadMode::On
-																			  : ChunkBlockAnalyser::EPartialBlockDownloadMode::SingleRange);
+						BlockPartialDownloadModes.push_back(BlockExistInCache
+																? ChunkBlockAnalyser::EPartialBlockDownloadMode::MultiRangeHighSpeed
+																: ChunkBlockAnalyser::EPartialBlockDownloadMode::SingleRange);
 					}
 				}
 			}