diff options
| author | 2026-03-08 17:54:20 +0800 | |
|---|---|---|
| committer | 2026-03-08 17:54:31 +0800 | |
| commit | 2f427535c637279de022ceb5690690ff0e234b52 (patch) | |
| tree | 2415af48262a811eee07d7d7ceb22fd3b71aa2cd | |
| parent | *: Fix lints (diff) | |
| signature | No signature | |
format/pack/ingest: Call it writeProgressf
TODO: Check for how flushing works
| -rw-r--r-- | format/pack/ingest/idx_write.go | 8 | ||||
| -rw-r--r-- | format/pack/ingest/progress_write.go | 2 | ||||
| -rw-r--r-- | format/pack/ingest/rev_write.go | 8 | ||||
| -rw-r--r-- | format/pack/ingest/scan.go | 4 | ||||
| -rw-r--r-- | format/pack/ingest/thin_fix.go | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/format/pack/ingest/idx_write.go b/format/pack/ingest/idx_write.go index 91f70f3f..04ab3aa2 100644 --- a/format/pack/ingest/idx_write.go +++ b/format/pack/ingest/idx_write.go @@ -45,7 +45,7 @@ func writeIdx(state *ingestState) error { fanout [256]uint32 ) - writeProgress(state, "writing index fanout...\r") + writeProgressf(state, "writing index fanout...\r") for _, recordIdx := range order { idRaw := state.records[recordIdx].objectID.Bytes() @@ -71,7 +71,7 @@ func writeIdx(state *ingestState) error { } } - writeProgress(state, "writing index fanout: done.\n") + writeProgressf(state, "writing index fanout: done.\n") largeOffsetCount := 0 @@ -196,7 +196,7 @@ func writeIdx(state *ingestState) error { largeOffsetMeter.Stop("done") } - writeProgress(state, "writing index trailer...\r") + writeProgressf(state, "writing index trailer...\r") err = write(state.packHash.Bytes()) if err != nil { @@ -215,7 +215,7 @@ func writeIdx(state *ingestState) error { return err } - writeProgress(state, "writing index trailer: done.\n") + writeProgressf(state, "writing index trailer: done.\n") return nil } diff --git a/format/pack/ingest/progress_write.go b/format/pack/ingest/progress_write.go index f372f9d0..5b9f184b 100644 --- a/format/pack/ingest/progress_write.go +++ b/format/pack/ingest/progress_write.go @@ -2,7 +2,7 @@ package ingest import "codeberg.org/lindenii/furgit/internal/utils" -func writeProgress(state *ingestState, format string, args ...any) { +func writeProgressf(state *ingestState, format string, args ...any) { utils.BestEffortFprintf(state.opts.Progress, format, args...) if state.opts.ProgressFlush != nil { diff --git a/format/pack/ingest/rev_write.go b/format/pack/ingest/rev_write.go index 9b9432dc..f8c30c1b 100644 --- a/format/pack/ingest/rev_write.go +++ b/format/pack/ingest/rev_write.go @@ -35,7 +35,7 @@ func writeRev(state *ingestState) error { var scratch [8]byte - writeProgress(state, "writing reverse index header...\r") + writeProgressf(state, "writing reverse index header...\r") binary.BigEndian.PutUint32(scratch[:4], revMagic) err = writeAndHash(state.revFile, hashImpl, scratch[:4]) @@ -57,7 +57,7 @@ func writeRev(state *ingestState) error { return err } - writeProgress(state, "writing reverse index header: done.\n") + writeProgressf(state, "writing reverse index header: done.\n") entriesMeter := progress.New(progress.Options{ Writer: state.opts.Progress, @@ -89,7 +89,7 @@ func writeRev(state *ingestState) error { entriesMeter.Stop("done") } - writeProgress(state, "writing reverse index trailer...\r") + writeProgressf(state, "writing reverse index trailer...\r") err = writeAndHash(state.revFile, hashImpl, state.packHash.Bytes()) if err != nil { @@ -108,7 +108,7 @@ func writeRev(state *ingestState) error { return err } - writeProgress(state, "writing reverse index trailer: done.\n") + writeProgressf(state, "writing reverse index trailer: done.\n") return nil } diff --git a/format/pack/ingest/scan.go b/format/pack/ingest/scan.go index 8fe08ac3..d26653a8 100644 --- a/format/pack/ingest/scan.go +++ b/format/pack/ingest/scan.go @@ -21,14 +21,14 @@ func streamPackAndScan(state *ingestState) error { state.algo.Size(), ) - writeProgress(state, "validating pack header...\r") + writeProgressf(state, "validating pack header...\r") err = seedStreamWithPackHeader(state) if err != nil { return err } - writeProgress(state, "validating pack header: done.\n") + writeProgressf(state, "validating pack header: done.\n") state.records = make([]objectRecord, 0, state.objectCountHeader) state.ofsDeltas = make([]ofsDeltaRef, 0, state.objectCountHeader) diff --git a/format/pack/ingest/thin_fix.go b/format/pack/ingest/thin_fix.go index 9013dbc8..f33f7b50 100644 --- a/format/pack/ingest/thin_fix.go +++ b/format/pack/ingest/thin_fix.go @@ -15,7 +15,7 @@ func maybeFixThin(state *ingestState) error { return nil } - writeProgress( + writeProgressf( state, "fixing thin pack: %d unresolved bases\r", len(state.unresolvedRefDeltas), |
