receivepack/service, format/pack/ingest: Progress uniform

2 files changed, 6 insertions, 4 deletions

diff --git a/format/pack/ingest/ingest.go b/format/pack/ingest/ingest.go
index 5f204c2b..e503b285 100644
--- a/format/pack/ingest/ingest.go
+++ b/format/pack/ingest/ingest.go
@@ -51,7 +51,7 @@ func ingest(state *ingestState) (out Result, err error) {
 		return Result{}, err
 	}
 
-	utils.WriteProgressf(state.opts.Progress, "writing index: start\n")
+	utils.WriteProgressf(state.opts.Progress, "writing index...\r")
 	err = state.packFile.Sync()
 	if err != nil {
 		return Result{}, &DestinationWriteError{Op: fmt.Sprintf("sync pack: %v", err)}
@@ -61,17 +61,17 @@ func ingest(state *ingestState) (out Result, err error) {
 	if err != nil {
 		return Result{}, err
 	}
-	utils.WriteProgressf(state.opts.Progress, "writing index: done\n")
+	utils.WriteProgressf(state.opts.Progress, "writing index: done.\n")
 
 	if state.opts.WriteRev {
-		utils.WriteProgressf(state.opts.Progress, "writing reverse index: start\n")
+		utils.WriteProgressf(state.opts.Progress, "writing reverse index...\r")
 	}
 	err = writeRev(state)
 	if err != nil {
 		return Result{}, err
 	}
 	if state.opts.WriteRev {
-		utils.WriteProgressf(state.opts.Progress, "writing reverse index: done\n")
+		utils.WriteProgressf(state.opts.Progress, "writing reverse index: done.\n")
 	}
 
 	return finalizeArtifacts(state)
diff --git a/format/pack/ingest/scan.go b/format/pack/ingest/scan.go
index a0d06dac..94251cb9 100644
--- a/format/pack/ingest/scan.go
+++ b/format/pack/ingest/scan.go
@@ -21,10 +21,12 @@ func streamPackAndScan(state *ingestState) error {
 		state.algo.Size(),
 	)
 
+	utils.WriteProgressf(state.opts.Progress, "validating pack header...\r")
 	err = readAndValidatePackHeader(state)
 	if err != nil {
 		return err
 	}
+	utils.WriteProgressf(state.opts.Progress, "validating pack header: done.\n")
 
 	state.records = make([]objectRecord, 0, state.objectCountHeader)
 	state.ofsDeltas = make([]ofsDeltaRef, 0, state.objectCountHeader)