From cb207dc2c9ac9218f4e1e75ec3aa46616eaa6c87 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 8 Mar 2026 03:40:00 +0800 Subject: receivepack/service, format/pack/ingest: Progress uniform --- receivepack/service/ingest_quarantine.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'receivepack/service/ingest_quarantine.go') diff --git a/receivepack/service/ingest_quarantine.go b/receivepack/service/ingest_quarantine.go index 8e592bb9..2956c51e 100644 --- a/receivepack/service/ingest_quarantine.go +++ b/receivepack/service/ingest_quarantine.go @@ -16,8 +16,6 @@ func (service *Service) ingestQuarantine( return "", nil, true } - utils.WriteProgressf(service.opts.Progress, "receiving objects: ingesting pack\n") - if req.Pack == nil { utils.WriteProgressf(service.opts.Progress, "receiving objects: unpack failed: missing pack stream\n") @@ -36,6 +34,7 @@ func (service *Service) ingestQuarantine( return "", nil, false } + utils.WriteProgressf(service.opts.Progress, "creating quarantine...\r") quarantineName, quarantineRoot, err := service.createQuarantineRoot() if err != nil { utils.WriteProgressf(service.opts.Progress, "receiving objects: unpack failed: %v\n", err) @@ -58,6 +57,8 @@ func (service *Service) ingestQuarantine( return "", nil, false } + utils.WriteProgressf(service.opts.Progress, "creating quarantine: done.\n") + utils.WriteProgressf(service.opts.Progress, "receiving objects: unpacking...\r") ingested, err := ingest.Ingest( req.Pack, @@ -85,12 +86,7 @@ func (service *Service) ingestQuarantine( return "", nil, false } - utils.WriteProgressf( - service.opts.Progress, - "receiving objects: unpack ok, %d objects (%s)\n", - ingested.ObjectCount, - ingested.PackHash, - ) + utils.WriteProgressf(service.opts.Progress, "receiving objects: unpacking: done (%d objects, %s).\n", ingested.ObjectCount, ingested.PackHash) result.Ingest = &ingested -- cgit v1.3.1-10-gc9f91