From 55225621f018904abf7e212320bb784dc64f8ac3 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Fri, 18 Nov 2022 11:35:13 +0100 Subject: Add `import-project` and `export-project` (#183) * Add `import-project` and `export-project` command line parsing --- zenserver/upstream/upstreamcache.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'zenserver/upstream/upstreamcache.cpp') diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index f9673bcd6..bc06653b9 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -253,7 +253,7 @@ namespace detail { if (CompressedBuffer Chunk = CompressedBuffer::FromCompressed(SharedBuffer(AttachmentResult.Response))) { - Package.AddAttachment(CbAttachment(Chunk)); + Package.AddAttachment(CbAttachment(Chunk, AttachmentHash.AsHash())); } else { @@ -337,7 +337,7 @@ namespace detail { { if (CompressedBuffer Chunk = CompressedBuffer::FromCompressed(SharedBuffer(BlobResult.Response))) { - Package.AddAttachment(CbAttachment(Chunk)); + Package.AddAttachment(CbAttachment(Chunk, AttachmentHash.AsHash())); } } }); @@ -1254,7 +1254,7 @@ namespace detail { { if (CompressedBuffer AttachmentBuffer = CompressedBuffer::FromCompressed(SharedBuffer(Value))) { - Package.AddAttachment(CbAttachment(AttachmentBuffer)); + Package.AddAttachment(CbAttachment(AttachmentBuffer, IoHash::FromBLAKE3(AttachmentBuffer.GetRawHash()))); } else { @@ -1312,8 +1312,9 @@ namespace detail { } BatchWriter.EndObject(); // Policy unspecified and expected to be Default - BatchWriter.AddBinaryAttachment("RawHash"sv, IoHash::FromBLAKE3(Compressed.GetRawHash())); - BatchPackage.AddAttachment(CbAttachment(Compressed)); + IoHash Hash = IoHash::FromBLAKE3(Compressed.GetRawHash()); + BatchWriter.AddBinaryAttachment("RawHash"sv, Hash); + BatchPackage.AddAttachment(CbAttachment(Compressed, Hash)); } BatchWriter.EndObject(); } -- cgit v1.2.3