add --ignore-missing-attachments to oplog-import command (#637)

1 files changed, 23 insertions, 15 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 038a6db47..e37fb26f4 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3171,9 +3171,10 @@ ProjectStore::Import(ProjectStore::Project& Project, ProjectStore::Oplog& Oplog,
 
 	using namespace std::literals;
 
-	size_t MaxBlockSize		 = Params["maxblocksize"sv].AsUInt64(128u * 1024u * 1024u);
-	size_t MaxChunkEmbedSize = Params["maxchunkembedsize"sv].AsUInt64(1024u * 1024u);
-	bool   Force			 = Params["force"sv].AsBool(false);
+	size_t MaxBlockSize				= Params["maxblocksize"sv].AsUInt64(128u * 1024u * 1024u);
+	size_t MaxChunkEmbedSize		= Params["maxchunkembedsize"sv].AsUInt64(1024u * 1024u);
+	bool   Force					= Params["force"sv].AsBool(false);
+	bool   IgnoreMissingAttachments = Params["ignoremissingattachments"sv].AsBool(false);
 
 	CreateRemoteStoreResult RemoteStoreResult = CreateRemoteStore(Params, AuthManager, MaxBlockSize, MaxChunkEmbedSize, Oplog.TempPath());
 
@@ -3185,18 +3186,25 @@ ProjectStore::Import(ProjectStore::Project& Project, ProjectStore::Oplog& Oplog,
 	RemoteProjectStore::RemoteStoreInfo StoreInfo	= RemoteStore->GetInfo();
 
 	ZEN_INFO("Loading oplog '{}/{}' from {}", Project.Identifier, Oplog.OplogId(), StoreInfo.Description);
-	JobId JobId = m_JobQueue.QueueJob(
-		fmt::format("Import oplog '{}/{}' from {}", Project.Identifier, Oplog.OplogId(), StoreInfo.Description),
-		[this, ActualRemoteStore = std::move(RemoteStore), OplogPtr = &Oplog, MaxBlockSize, MaxChunkEmbedSize, Force](JobContext& Context) {
-			RemoteProjectStore::Result Result	= LoadOplog(m_CidStore, *ActualRemoteStore, *OplogPtr, Force, &Context);
-			auto					   Response = ConvertResult(Result);
-			ZEN_INFO("LoadOplog: Status: {} '{}'", ToString(Response.first), Response.second);
-			if (!IsHttpSuccessCode(Response.first))
-			{
-				throw std::runtime_error(
-					fmt::format("Import failed. Status '{}'. Reason: '{}'", ToString(Response.first), Response.second));
-			}
-		});
+	JobId JobId =
+		m_JobQueue.QueueJob(fmt::format("Import oplog '{}/{}' from {}", Project.Identifier, Oplog.OplogId(), StoreInfo.Description),
+							[this,
+							 ActualRemoteStore = std::move(RemoteStore),
+							 OplogPtr		   = &Oplog,
+							 MaxBlockSize,
+							 MaxChunkEmbedSize,
+							 Force,
+							 IgnoreMissingAttachments](JobContext& Context) {
+								RemoteProjectStore::Result Result =
+									LoadOplog(m_CidStore, *ActualRemoteStore, *OplogPtr, Force, IgnoreMissingAttachments, &Context);
+								auto Response = ConvertResult(Result);
+								ZEN_INFO("LoadOplog: Status: {} '{}'", ToString(Response.first), Response.second);
+								if (!IsHttpSuccessCode(Response.first))
+								{
+									throw std::runtime_error(
+										fmt::format("Import failed. Status '{}'. Reason: '{}'", ToString(Response.first), Response.second));
+								}
+							});
 
 	return {HttpResponseCode::Accepted, fmt::format("{}", JobId.Id)};
 }