sneak/mfer
1
0
Fork 0
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Fix progress line not clearing before final status

Browse Source
This commit is contained in:
Jeffrey Paul 2025-12-17 15:01:32 -08:00
parent 21028af9aa
commit 45201509ff
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/cli/gen.go
View File

@ -3,6 +3,7 @@ package cli
import ( import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"sync"
"time" "time"
"github.com/spf13/afero" "github.com/spf13/afero"
@ -28,9 +29,12 @@ func (mfa *CLIApp) generateManifestOperation(ctx *cli.Context) error {
// Set up enumeration progress reporting // Set up enumeration progress reporting
var enumProgress chan scanner.EnumerateStatus var enumProgress chan scanner.EnumerateStatus
var enumWg sync.WaitGroup
if showProgress { if showProgress {
enumProgress = make(chan scanner.EnumerateStatus, 1) enumProgress = make(chan scanner.EnumerateStatus, 1)
enumWg.Add(1)
go func() { go func() {
defer enumWg.Done()
for status := range enumProgress { for status := range enumProgress {
log.Progressf("Enumerating: %d files, %.1f MB", log.Progressf("Enumerating: %d files, %.1f MB",
status.FilesFound, status.FilesFound,
@ -60,6 +64,7 @@ func (mfa *CLIApp) generateManifestOperation(ctx *cli.Context) error {
return err return err
} }
} }
enumWg.Wait()
log.Debugf("enumerated %d files, %d bytes total", s.FileCount(), s.TotalBytes()) log.Debugf("enumerated %d files, %d bytes total", s.FileCount(), s.TotalBytes())
@ -80,9 +85,12 @@ func (mfa *CLIApp) generateManifestOperation(ctx *cli.Context) error {
// Phase 2: Scan - read file contents and generate manifest // Phase 2: Scan - read file contents and generate manifest
var scanProgress chan scanner.ScanStatus var scanProgress chan scanner.ScanStatus
var scanWg sync.WaitGroup
if showProgress { if showProgress {
scanProgress = make(chan scanner.ScanStatus, 1) scanProgress = make(chan scanner.ScanStatus, 1)
scanWg.Add(1)
go func() { go func() {
defer scanWg.Done()
for status := range scanProgress { for status := range scanProgress {
if status.ETA > 0 { if status.ETA > 0 {
log.Progressf("Scanning: %d/%d files, %.1f MB/s, ETA %s", log.Progressf("Scanning: %d/%d files, %.1f MB/s, ETA %s",
@ -102,6 +110,7 @@ func (mfa *CLIApp) generateManifestOperation(ctx *cli.Context) error {
} }
err = s.ToManifest(ctx.Context, outFile, scanProgress) err = s.ToManifest(ctx.Context, outFile, scanProgress)
scanWg.Wait()
if err != nil { if err != nil {
return fmt.Errorf("failed to generate manifest: %w", err) return fmt.Errorf("failed to generate manifest: %w", err)
} }