sneak/attrsum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return errors from countFiles instead of swallowing them

Browse Source 
countFiles and countFilesMultiple now return errors instead of silently
ignoring them. This ensures that issues like non-existent paths or
permission errors are reported early rather than showing a misleading
progress bar with 0 total.
This commit is contained in:
Jeffrey Paul 2026-02-02 13:47:40 -08:00
parent b9d65115c2
commit 2e44e5bb78
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
attrsum.go
View File

@ -148,7 +148,11 @@ func newSumCmd() *cobra.Command {
stats := &Stats{StartTime: time.Now()} stats := &Stats{StartTime: time.Now()}
var bar *progressbar.ProgressBar var bar *progressbar.ProgressBar
if !quiet { if !quiet {
bar = newProgressBar(countFilesMultiple(paths), "Adding checksums") total, err := countFilesMultiple(paths)
if err != nil {
return err
}
bar = newProgressBar(total, "Adding checksums")
} }
for _, p := range paths { for _, p := range paths {
if err := ProcessSumAdd(p, stats, bar); err != nil { if err := ProcessSumAdd(p, stats, bar); err != nil {
@ -178,7 +182,11 @@ func newSumCmd() *cobra.Command {
stats := &Stats{StartTime: time.Now()} stats := &Stats{StartTime: time.Now()}
var bar *progressbar.ProgressBar var bar *progressbar.ProgressBar
if !quiet { if !quiet {
bar = newProgressBar(countFilesMultiple(paths), "Updating checksums") total, err := countFilesMultiple(paths)
if err != nil {
return err
}
bar = newProgressBar(total, "Updating checksums")
} }
for _, p := range paths { for _, p := range paths {
if err := ProcessSumUpdate(p, stats, bar); err != nil { if err := ProcessSumUpdate(p, stats, bar); err != nil {
@ -279,7 +287,11 @@ func newClearCmd() *cobra.Command {
stats := &Stats{StartTime: time.Now()} stats := &Stats{StartTime: time.Now()}
var bar *progressbar.ProgressBar var bar *progressbar.ProgressBar
if !quiet { if !quiet {
bar = newProgressBar(countFilesMultiple(paths), "Clearing checksums") total, err := countFilesMultiple(paths)
if err != nil {
return err
}
bar = newProgressBar(total, "Clearing checksums")
} }
for _, p := range paths { for _, p := range paths {
if err := ProcessClear(p, stats, bar); err != nil { if err := ProcessClear(p, stats, bar); err != nil {
@ -347,7 +359,11 @@ func newCheckCmd() *cobra.Command {
stats := &Stats{StartTime: time.Now()} stats := &Stats{StartTime: time.Now()}
var bar *progressbar.ProgressBar var bar *progressbar.ProgressBar
if !quiet { if !quiet {
bar = newProgressBar(countFilesMultiple(paths), "Verifying checksums") total, err := countFilesMultiple(paths)
if err != nil {
return err
}
bar = newProgressBar(total, "Verifying checksums")
} }
var finalErr error var finalErr error
for _, p := range paths { for _, p := range paths {
@ -438,12 +454,12 @@ func ProcessCheck(dir string, cont bool, stats *Stats, bar *progressbar.Progress
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// countFiles counts the total number of regular files that will be processed // countFiles counts the total number of regular files that will be processed
func countFiles(root string) int64 { func countFiles(root string) (int64, error) {
var count int64 var count int64
root = filepath.Clean(root) root = filepath.Clean(root)
filepath.Walk(root, func(p string, info os.FileInfo, err error) error { err := filepath.Walk(root, func(p string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
return nil return err
} }
// Skip symlinks - note: filepath.Walk uses Lstat, so symlinks are // Skip symlinks - note: filepath.Walk uses Lstat, so symlinks are
// reported as ModeSymlink, never as directories. Walk doesn't follow them. // reported as ModeSymlink, never as directories. Walk doesn't follow them.
@ -466,16 +482,20 @@ func countFiles(root string) int64 {
count++ count++
return nil return nil
}) })
return count return count, err
} }
// countFilesMultiple counts files across multiple roots // countFilesMultiple counts files across multiple roots
func countFilesMultiple(roots []string) int64 { func countFilesMultiple(roots []string) (int64, error) {
var total int64 var total int64
for _, root := range roots { for _, root := range roots {
total += countFiles(root) count, err := countFiles(root)
if err != nil {
return total, err
}
total += count
} }
return total return total, nil
} }
// newProgressBar creates a new progress bar with standard options // newProgressBar creates a new progress bar with standard options