block scavenge of other downloads that uses an older state file (#822)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/zenremotestore/builds/buildsavedstate.cpp b/src/zenremotestore/builds/buildsavedstate.cpp
index 0685bf679..dfc565d4a 100644
--- a/src/zenremotestore/builds/buildsavedstate.cpp
+++ b/src/zenremotestore/builds/buildsavedstate.cpp
@@ -163,6 +163,8 @@ BuildSaveState::Write(const BuildSaveState& SaveState, CbWriter& Output)
 {
 	ZEN_ASSERT(!SaveState.LocalPath.empty());
 
+	Output.AddInteger("version", SaveState.Version);
+
 	Output.AddString("path", (const char*)SaveState.LocalPath.u8string().c_str());
 	BuildsSelection::Write(SaveState.State.Selection, Output);
 
@@ -182,6 +184,7 @@ BuildSaveState::Write(const BuildSaveState& SaveState, CbWriter& Output)
 BuildSaveState
 BuildSaveState::Read(CbObjectView& Input)
 {
+	uint32_t			  Version				 = Input["version"].AsUInt32(BuildSaveState::NoVersion);
 	BuildState			  State					 = BuildState::Read(Input);
 	CbObjectView		  LocalFolderStateObject = Input["localFolderState"sv].AsObjectView();
 	FolderContent		  FolderState			 = LoadFolderContentToCompactBinary(LocalFolderStateObject);
@@ -191,7 +194,10 @@ BuildSaveState::Read(CbObjectView& Input)
 		throw std::runtime_error("BuildSaveState is invalid, 'path' field is empty");
 	}
 
-	return BuildSaveState{.State = std::move(State), .FolderState = std::move(FolderState), .LocalPath = std::move(LocalPath)};
+	return BuildSaveState{.Version	   = Version,
+						  .State	   = std::move(State),
+						  .FolderState = std::move(FolderState),
+						  .LocalPath   = std::move(LocalPath)};
 }
 
 CbObject