fix log progress quotes (#580)

* add quotes to message in log-progress mode
* improved log progress for builds upload and download

1 files changed, 14 insertions, 5 deletions

diff --git a/src/zenremotestore/builds/buildstorageoperations.cpp b/src/zenremotestore/builds/buildstorageoperations.cpp
index ef180935e..431f1caf3 100644
--- a/src/zenremotestore/builds/buildstorageoperations.cpp
+++ b/src/zenremotestore/builds/buildstorageoperations.cpp
@@ -652,6 +652,7 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState)
 		WriteChunks,
 		PrepareTarget,
 		FinalizeTarget,
+		Cleanup,
 		StepCount
 	};
 
@@ -2282,6 +2283,8 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState)
 		}
 	}
 
+	m_LogOutput.SetLogOperationProgress(TaskSteps::FinalizeTarget, TaskSteps::StepCount);
+
 	if (m_Options.WipeTargetFolder)
 	{
 		ZEN_TRACE_CPU("WipeTarget");
@@ -2303,8 +2306,6 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState)
 	{
 		ZEN_TRACE_CPU("FinalizeTree");
 
-		m_LogOutput.SetLogOperationProgress(TaskSteps::FinalizeTarget, TaskSteps::StepCount);
-
 		Stopwatch Timer;
 
 		std::unique_ptr<BuildOpLogOutput::ProgressBar> RebuildProgressBarPtr(m_LogOutput.CreateProgressBar("Rebuild State"));
@@ -2611,6 +2612,7 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState)
 		m_RebuildFolderStateStats.FinalizeTreeElapsedWallTimeUs = Timer.GetElapsedTimeUs();
 		RebuildProgressBar.Finish();
 	}
+	m_LogOutput.SetLogOperationProgress(TaskSteps::Cleanup, TaskSteps::StepCount);
 }
 
 void
@@ -4578,8 +4580,10 @@ BuildsOperationUploadFolder::Execute()
 	{
 		PrepareBuild,
 		CalculateDelta,
+		GenerateBlocks,
+		BuildPartManifest,
 		Upload,
-		//		Validate,
+		FinalizeBuild,
 		Cleanup,
 		StepCount
 	};
@@ -4945,10 +4949,9 @@ BuildsOperationUploadFolder::Execute()
 				   NiceTimeSpanMs(BlockArrangeTimer.GetElapsedTimeMs()));
 	}
 
+	m_LogOutput.SetLogOperationProgress(TaskSteps::GenerateBlocks, TaskSteps::StepCount);
 	GeneratedBlocks NewBlocks;
 
-	m_LogOutput.SetLogOperationProgress(TaskSteps::Upload, TaskSteps::StepCount);
-
 	if (!NewBlockChunks.empty())
 	{
 		Stopwatch GenerateBuildBlocksTimer;
@@ -4971,6 +4974,8 @@ BuildsOperationUploadFolder::Execute()
 		GenerateBuildBlocks(LocalContent, LocalLookup, NewBlockChunks, NewBlocks);
 	}
 
+	m_LogOutput.SetLogOperationProgress(TaskSteps::BuildPartManifest, TaskSteps::StepCount);
+
 	CbObject PartManifest;
 	{
 		CbObjectWriter PartManifestWriter;
@@ -5128,6 +5133,8 @@ BuildsOperationUploadFolder::Execute()
 		PartManifest = PartManifestWriter.Save();
 	}
 
+	m_LogOutput.SetLogOperationProgress(TaskSteps::Upload, TaskSteps::StepCount);
+
 	Stopwatch							   PutBuildPartResultTimer;
 	std::pair<IoHash, std::vector<IoHash>> PutBuildPartResult =
 		m_Storage.BuildStorage->PutBuildPart(m_BuildId, m_BuildPartId, m_BuildPartName, PartManifest);
@@ -5244,6 +5251,8 @@ BuildsOperationUploadFolder::Execute()
 		UploadAttachments(Needs);
 	}
 
+	m_LogOutput.SetLogOperationProgress(TaskSteps::FinalizeBuild, TaskSteps::StepCount);
+
 	if (m_CreateBuild && !m_AbortFlag)
 	{
 		Stopwatch FinalizeBuildTimer;